Skip to content

Commit 325ee6e

Browse files
scottgonzalezscottgonzalez
committed
Widget: define a null default for the create callback.
1 parent c4c36e5 commit 325ee6e

15 files changed

+125
-121
lines changed

‎tests/unit/accordion/accordion_defaults.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ commonWidgetTests( "accordion", {
1414

1515
// callbacks
1616
activate: null,
17-
beforeActivate: null
17+
beforeActivate: null,
18+
create: null
1819
}
1920
});

‎tests/unit/accordion/accordion_defaults_deprecated.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ commonWidgetTests( "accordion", {
2222
activate: null,
2323
beforeActivate: null,
2424
change: null,
25-
changestart: null
25+
changestart: null,
26+
create: null
2627
}
2728
});

‎tests/unit/autocomplete/autocomplete_defaults.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ commonWidgetTests( "autocomplete", {
1515
// callbacks
1616
change: null,
1717
close: null,
18+
create: null,
1819
focus: null,
1920
open: null,
2021
response: null,

‎tests/unit/button/button_defaults.js

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
1-
/*
2-
* button_defaults.js
3-
*/
1+
commonWidgetTests( "button", {
2+
defaults: {
3+
disabled: null,
4+
icons: {
5+
primary: null,
6+
secondary: null
7+
},
8+
label: null,
9+
text: true,
410

5-
var button_defaults = {
6-
disabled: null,
7-
text: true,
8-
label: null,
9-
icons: {
10-
primary: null,
11-
secondary: null
11+
// callbacks
12+
create: null
1213
}
13-
};
14-
15-
commonWidgetTests('button', { defaults: button_defaults });
14+
});

‎tests/unit/dialog/dialog_defaults.js

Lines changed: 33 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,34 @@
1-
/*
2-
* dialog_defaults.js
3-
*/
1+
commonWidgetTests( "dialog", {
2+
defaults: {
3+
autoOpen: true,
4+
buttons: {},
5+
closeOnEscape: true,
6+
closeText: 'close',
7+
disabled: false,
8+
dialogClass: '',
9+
draggable: true,
10+
height: 'auto',
11+
hide: null,
12+
maxHeight: false,
13+
maxWidth: false,
14+
minHeight: 150,
15+
minWidth: 150,
16+
modal: false,
17+
position: {
18+
my: 'center',
19+
at: 'center',
20+
of: window,
21+
collision: 'fit',
22+
using: $.ui.dialog.prototype.options.position.using
23+
},
24+
resizable: true,
25+
show: null,
26+
stack: true,
27+
title: '',
28+
width: 300,
29+
zIndex: 1000,
430

5-
var dialog_defaults = {
6-
autoOpen: true,
7-
buttons: {},
8-
closeOnEscape: true,
9-
closeText: 'close',
10-
disabled: false,
11-
dialogClass: '',
12-
draggable: true,
13-
height: 'auto',
14-
hide: null,
15-
maxHeight: false,
16-
maxWidth: false,
17-
minHeight: 150,
18-
minWidth: 150,
19-
modal: false,
20-
position: {
21-
my: 'center',
22-
at: 'center',
23-
of: window,
24-
collision: 'fit',
25-
using: $.ui.dialog.prototype.options.position.using
26-
},
27-
resizable: true,
28-
show: null,
29-
stack: true,
30-
title: '',
31-
width: 300,
32-
zIndex: 1000
33-
};
34-
35-
commonWidgetTests('dialog', { defaults: dialog_defaults });
31+
// callbacks
32+
create: null
33+
}
34+
});

‎tests/unit/dialog/dialog_options.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ test("height", function() {
180180
expect(3);
181181

182182
el = $('<div></div>').dialog();
183-
equals(dlg().height(), dialog_defaults.minHeight, "default height");
183+
equals(dlg().height(), 150, "default height");
184184
el.remove();
185185

186186
el = $('<div></div>').dialog({ height: 237 });
@@ -431,7 +431,7 @@ test("width", function() {
431431
expect(3);
432432

433433
el = $('<div></div>').dialog();
434-
equals(dlg().width(), dialog_defaults.width, "default width");
434+
equals(dlg().width(), 300, "default width");
435435
el.remove();
436436

437437
el = $('<div></div>').dialog({width: 437 });

‎tests/unit/menu/menu_defaults.js

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
/*
2-
* menu_defaults.js
3-
*/
1+
commonWidgetTests( "menu", {
2+
defaults: {
3+
disabled: false,
4+
position: {
5+
my: "left top",
6+
at: "right top"
7+
},
48

5-
var menu_defaults = {
6-
disabled: false,
7-
position: {
8-
my: "left top",
9-
at: "right top"
9+
// callbacks
10+
create: null
1011
}
11-
};
12-
13-
commonWidgetTests('menu', { defaults: menu_defaults });
12+
});

‎tests/unit/progressbar/progressbar_defaults.js

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
/*
2-
* progressbar_defaults.js
3-
*/
1+
commonWidgetTests( "progressbar", {
2+
defaults: {
3+
disabled: false,
4+
value: 0,
5+
max: 100,
46

5-
var progressbar_defaults = {
6-
disabled: false,
7-
value: 0,
8-
max: 100
9-
};
10-
11-
commonWidgetTests('progressbar', { defaults: progressbar_defaults });
7+
//callbacks
8+
create: null
9+
}
10+
});

‎tests/unit/slider/slider_defaults.js

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
1-
/*
2-
* slider_defaults.js
3-
*/
1+
commonWidgetTests( "slider", {
2+
defaults: {
3+
animate: false,
4+
cancel: function() {},
5+
delay: 0,
6+
disabled: false,
7+
distance: 0,
8+
max: 100,
9+
min: 0,
10+
orientation: 'horizontal',
11+
range: false,
12+
step: 1,
13+
value: 0,
14+
values: null,
415

5-
var slider_defaults = {
6-
animate: false,
7-
cancel: function() {},
8-
delay: 0,
9-
disabled: false,
10-
distance: 0,
11-
max: 100,
12-
min: 0,
13-
orientation: 'horizontal',
14-
range: false,
15-
step: 1,
16-
value: 0,
17-
values: null
18-
};
19-
20-
commonWidgetTests('slider', { defaults: slider_defaults });
16+
// callbacks
17+
create: null
18+
}
19+
});

‎tests/unit/spinner/spinner_defaults.js

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
1-
/*
2-
* spinner_defaults.js
3-
*/
1+
commonWidgetTests( "spinner", {
2+
defaults: {
3+
disabled: false,
4+
incremental: true,
5+
max: null,
6+
min: null,
7+
numberformat: null,
8+
page: 10,
9+
step: null,
10+
value: null,
411

5-
var spinner_defaults = {
6-
disabled: false,
7-
incremental: true,
8-
max: null,
9-
min: null,
10-
numberformat: null,
11-
page: 10,
12-
step: null,
13-
value: null
14-
};
15-
16-
commonWidgetTests('spinner', { defaults: spinner_defaults });
12+
// callbacks
13+
create: null
14+
}
15+
});

‎tests/unit/tabs/tabs_defaults.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ commonWidgetTests( "tabs", {
1010
activate: null,
1111
beforeActivate: null,
1212
beforeLoad: null,
13+
create: null,
1314
load: null
1415
}
1516
});

‎tests/unit/tabs/tabs_defaults_deprecated.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ commonWidgetTests( "tabs", {
1818
add: null,
1919
beforeActivate: null,
2020
beforeLoad: null,
21+
create: null,
2122
disable: null,
2223
enable: null,
2324
load: null,

‎tests/unit/tooltip/tooltip_defaults.js

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
1-
/*
2-
* tooltip_defaults.js
3-
*/
1+
commonWidgetTests( "tooltip", {
2+
defaults: {
3+
disabled: false,
4+
items: "[title]",
5+
content: $.ui.tooltip.prototype.options.content,
6+
position: {
7+
my: "left center",
8+
at: "right center",
9+
offset: "15 0"
10+
},
411

5-
var tooltip_defaults = {
6-
disabled: false,
7-
items: "[title]",
8-
content: $.ui.tooltip.prototype.options.content,
9-
position: {
10-
my: "left center",
11-
at: "right center",
12-
offset: "15 0"
12+
// callbacks
13+
create: null
1314
}
14-
};
15-
16-
commonWidgetTests('tooltip', { defaults: tooltip_defaults });
15+
});

‎tests/unit/widget/widget_core.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,7 @@ test( "merge multiple option arguments", function() {
202202
$.widget( "ui.testWidget", {
203203
_create: function() {
204204
same( this.options, {
205+
create: null,
205206
disabled: false,
206207
option1: "value1",
207208
option2: "value2",
@@ -249,6 +250,7 @@ test( "._getCreateOptions()", function() {
249250
},
250251
_create: function() {
251252
same( this.options, {
253+
create: null,
252254
disabled: false,
253255
option1: "override1",
254256
option2: "value2",
@@ -418,6 +420,7 @@ test( ".option() - getter", function() {
418420

419421
var options = div.testWidget( "option" );
420422
same( options, {
423+
create: null,
421424
disabled: false,
422425
foo: "bar",
423426
baz: 5,

‎ui/jquery.ui.widget.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,10 @@ $.Widget.prototype = {
155155
widgetEventPrefix: "",
156156
defaultElement: "<div>",
157157
options: {
158-
disabled: false
158+
disabled: false,
159+
160+
// callbacks
161+
create: null
159162
},
160163
_createWidget: function( options, element ) {
161164
element = $( element || this.defaultElement || this )[ 0 ];

0 commit comments

Comments
 (0)