Skip to content

Commit cd04c9a

Browse files
committed
move to v6.0.0
lint
1 parent 5fa6ee9 commit cd04c9a

File tree

20 files changed

+115
-172
lines changed

20 files changed

+115
-172
lines changed

Manifest.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,7 @@
4040
}
4141
},
4242
"requires": {
43-
"@qooxdoo/compiler": "^1.0.0-beta",
44-
"@qooxdoo/framework": "^6.0.0-beta",
45-
"qooxdoo/qxl.formdemo": "^1.0.0-beta.0",
46-
"qooxdoo/qxl.versionlabel": "^1.0.0-beta.0"
43+
"@qooxdoo/compiler": "^1.0.0",
44+
"@qooxdoo/framework": "^6.0.0"
4745
}
4846
}

qx-lock.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22
"libraries": [
33
{
44
"library_name": "formdemo",
5-
"library_version": "1.0.1",
6-
"path": "qx_packages/qooxdoo_qxl_formdemo_v1_0_1",
5+
"library_version": "1.0.2",
6+
"path": "qx_packages/qooxdoo_qxl_formdemo_v1_0_2",
77
"uri": "qooxdoo/qxl.formdemo",
88
"repo_name": "qooxdoo/qxl.formdemo",
9-
"repo_tag": "v1.0.1"
9+
"repo_tag": "v1.0.2"
1010
},
1111
{
1212
"library_name": "versionlabel",
13-
"library_version": "1.0.2",
14-
"path": "qx_packages/qooxdoo_qxl_versionlabel_v1_0_2",
13+
"library_version": "1.0.4",
14+
"path": "qx_packages/qooxdoo_qxl_versionlabel_v1_0_4",
1515
"uri": "qooxdoo/qxl.versionlabel",
1616
"repo_name": "qooxdoo/qxl.versionlabel",
17-
"repo_tag": "v1.0.2"
17+
"repo_tag": "v1.0.4"
1818
}
1919
],
2020
"version": "2.1.0"

source/class/qxl/widgetbrowser/Application.js

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,8 @@ qx.Class.define("qxl.widgetbrowser.Application",
2525
extend : qx.application.Standalone,
2626

2727

28-
construct: function()
29-
{
28+
construct: function() {
3029
this.base(arguments);
31-
3230
},
3331

3432
members:
@@ -39,8 +37,7 @@ qx.Class.define("qxl.widgetbrowser.Application",
3937

4038
__scroll: null,
4139

42-
main: function()
43-
{
40+
main: function() {
4441
this.base(arguments);
4542

4643
// Enable logging in debug variant
@@ -68,17 +65,14 @@ qx.Class.define("qxl.widgetbrowser.Application",
6865
padding: 15
6966
});
7067
scroll.add(this.__tabs);
71-
7268
},
7369

74-
_createTabView: function()
75-
{
70+
_createTabView: function() {
7671
this.__tabs = new qxl.widgetbrowser.view.TabView();
7772
return this.__tabs;
7873
},
7974

80-
getScroll: function()
81-
{
75+
getScroll: function() {
8276
return this.__scroll;
8377
}
8478
}

source/class/qxl/widgetbrowser/MControls.js

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,10 @@ qx.Mixin.define("qxl.widgetbrowser.MControls",
2222
members:
2323
{
2424

25-
initControls: function(widgets, options)
26-
{
25+
initControls: function(widgets, options) {
2726
options = options || {};
2827

29-
var controls = new qx.ui.container.Composite;
28+
var controls = new qx.ui.container.Composite();
3029
controls.setLayout(new qx.ui.layout.HBox(10));
3130
this.add(controls);
3231

@@ -96,7 +95,7 @@ qx.Mixin.define("qxl.widgetbrowser.MControls",
9695
}
9796

9897
if (options.invalid) {
99-
var toggleInvalid = new qx.ui.form.ToggleButton("Invalid");
98+
let toggleInvalid = new qx.ui.form.ToggleButton("Invalid");
10099
toggleInvalid.addListener("changeValue", function(e) {
101100
widgets.forEach(function(widget, index) {
102101
if (widget.setInvalidMessage && widget.setValid) {
@@ -109,7 +108,7 @@ qx.Mixin.define("qxl.widgetbrowser.MControls",
109108
}
110109

111110
if (options.overflow) {
112-
var toggleInvalid = new qx.ui.form.ToggleButton("Overflow");
111+
let toggleInvalid = new qx.ui.form.ToggleButton("Overflow");
113112
toggleInvalid.addListener("changeValue", function(e) {
114113
widgets.forEach(function(widget, index) {
115114
widget.toggleOverflow(widget, e.getData());
@@ -129,7 +128,6 @@ qx.Mixin.define("qxl.widgetbrowser.MControls",
129128
});
130129
controls.add(tb);
131130
}
132-
133131
}
134132
}
135-
});
133+
});

source/class/qxl/widgetbrowser/pages/AbstractPage.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ qx.Class.define("qxl.widgetbrowser.pages.AbstractPage",
2222

2323
extend: qx.ui.container.Composite,
2424

25-
construct : function()
26-
{
25+
construct : function() {
2726
this.base(arguments);
2827
this.setLayout(new qx.ui.layout.Canvas());
2928

@@ -34,8 +33,7 @@ qx.Class.define("qxl.widgetbrowser.pages.AbstractPage",
3433
{
3534
_widgets: null,
3635

37-
getWidgets: function()
38-
{
36+
getWidgets: function() {
3937
return this._widgets;
4038
}
4139
}

source/class/qxl/widgetbrowser/pages/Basic.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ qx.Class.define("qxl.widgetbrowser.pages.Basic",
3434
{
3535
extend: qxl.widgetbrowser.pages.AbstractPage,
3636

37-
construct: function()
38-
{
37+
construct: function() {
3938
this.base(arguments);
4039

4140
var hbox = this.__hbox = new qx.ui.container.Composite(new qx.ui.layout.HBox(10));
@@ -49,8 +48,7 @@ qx.Class.define("qxl.widgetbrowser.pages.Basic",
4948

5049
__hbox: null,
5150

52-
initWidgets: function()
53-
{
51+
initWidgets: function() {
5452
var widgets = this._widgets;
5553

5654
// Label

source/class/qxl/widgetbrowser/pages/Control.js

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ qx.Class.define("qxl.widgetbrowser.pages.Control",
2929
{
3030
extend: qxl.widgetbrowser.pages.AbstractPage,
3131

32-
construct: function()
33-
{
32+
construct: function() {
3433
this.base(arguments);
3534

3635
this.__vbox = new qx.ui.container.Composite(new qx.ui.layout.VBox(20));
@@ -63,8 +62,7 @@ qx.Class.define("qxl.widgetbrowser.pages.Control",
6362
widgets.push(openColorPopup);
6463
this.__vbox.add(label);
6564
this.__vbox.add(openColorPopup);
66-
openColorPopup.addListener("execute", function()
67-
{
65+
openColorPopup.addListener("execute", function() {
6866
colorPopup.placeToWidget(openColorPopup, true);
6967
colorPopup.show();
7068
});
@@ -75,7 +73,6 @@ qx.Class.define("qxl.widgetbrowser.pages.Control",
7573
widgets.push(dateChooser);
7674
this.__vbox.add(label);
7775
this.__vbox.add(dateChooser);
78-
7976
}
8077
}
81-
});
78+
});

source/class/qxl/widgetbrowser/pages/Embed.js

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@ qx.Class.define("qxl.widgetbrowser.pages.Embed",
3636
{
3737
extend: qxl.widgetbrowser.pages.AbstractPage,
3838

39-
construct: function()
40-
{
39+
construct: function() {
4140
this.base(arguments);
4241

4342
var gridLayout = new qx.ui.layout.Grid(100, 10);
@@ -53,8 +52,7 @@ qx.Class.define("qxl.widgetbrowser.pages.Embed",
5352

5453
__grid: null,
5554

56-
initWidgets: function()
57-
{
55+
initWidgets: function() {
5856
var widgets = this._widgets;
5957
var label;
6058

@@ -108,7 +106,7 @@ qx.Class.define("qxl.widgetbrowser.pages.Embed",
108106
htmlContainer.add(embed2);
109107

110108
// Rich content
111-
var rich = 'Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla f';
109+
var rich = "Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla f";
112110
var richWidget = new qx.ui.embed.Html(rich);
113111
widgets.push(richWidget);
114112
richWidget.setOverflow("auto", "auto");
@@ -124,10 +122,10 @@ qx.Class.define("qxl.widgetbrowser.pages.Embed",
124122
var ctx = data.context;
125123

126124
ctx.fillStyle = "rgb(200,0,0)";
127-
ctx.fillRect (20, 20, 105, 100);
125+
ctx.fillRect(20, 20, 105, 100);
128126

129127
ctx.fillStyle = "rgba(0, 0, 200, 0.5)";
130-
ctx.fillRect (70, 70, 105, 100);
128+
ctx.fillRect(70, 70, 105, 100);
131129
}
132130
}
133131
});

source/class/qxl/widgetbrowser/pages/EmbedFrame.js

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ qx.Class.define("qxl.widgetbrowser.pages.EmbedFrame",
3434
{
3535
extend: qxl.widgetbrowser.pages.AbstractPage,
3636

37-
construct: function()
38-
{
37+
construct: function() {
3938
this.base(arguments);
4039

4140
this.setLayout(new qx.ui.layout.Canvas(10));
@@ -45,10 +44,11 @@ qx.Class.define("qxl.widgetbrowser.pages.EmbedFrame",
4544
members :
4645
{
4746

48-
initWidgets: function()
49-
{
47+
initWidgets: function() {
5048
var widgets = this._widgets;
51-
var label, left, right;
49+
var label;
50+
var left;
51+
var right;
5252
var url = qx.util.ResourceManager.getInstance().toUri("qxl/widgetbrowser/blank.html");
5353

5454
var splitPane = new qx.ui.splitpane.Pane("horizontal");
@@ -83,7 +83,6 @@ qx.Class.define("qxl.widgetbrowser.pages.EmbedFrame",
8383

8484
splitPane.add(left);
8585
splitPane.add(right);
86-
8786
}
8887
}
8988
});

source/class/qxl/widgetbrowser/pages/Form.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@ qx.Class.define("qxl.widgetbrowser.pages.Form",
3535
ITEM_SIZE: 3
3636
},
3737

38-
construct : function()
39-
{
38+
construct : function() {
4039
this.base(arguments);
4140

4241
var formItems = new qxl.formdemo.FormItems();

0 commit comments

Comments
 (0)