Skip to content

Commit 7d96a0d

Browse files
scottgonzalezscottgonzalez
committed
Widget factory: Changed _create to _init.
Partial fix for #5064 - Widget: make multiple instantiation more useful.
1 parent ab153e0 commit 7d96a0d

15 files changed

Lines changed: 28 additions & 28 deletions

‎demos/autocomplete/combobox.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<script type="text/javascript">
1414
(function($) {
1515
$.widget("ui.combobox", {
16-
_init: function() {
16+
_create: function() {
1717
var self = this;
1818
var select = this.element.hide();
1919
var input = $("<input>")

‎tests/unit/widget/widget.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ module('widget factory', {
1111

1212
test('widget creation', function() {
1313
var myPrototype = {
14-
_init: function() {},
14+
_create: function() {},
1515
creationTest: function() {}
1616
};
1717

1818
$.widget('ui.testWidget', myPrototype);
1919
ok($.isFunction($.ui.testWidget), 'constructor was created');
2020
equals('object', typeof $.ui.testWidget.prototype, 'prototype was created');
21-
equals($.ui.testWidget.prototype._init, myPrototype._init, 'init function is copied over');
21+
equals($.ui.testWidget.prototype._create, myPrototype._create, 'create function is copied over');
2222
equals($.ui.testWidget.prototype.creationTest, myPrototype.creationTest, 'random function is copied over');
2323
equals($.ui.testWidget.prototype.option, $.Widget.prototype.option, 'option method copied over from base widget');
2424
});
@@ -30,7 +30,7 @@ test('jQuery usage', function() {
3030

3131
$.widget('ui.testWidget', {
3232
getterSetterVal: 5,
33-
_init: function() {
33+
_create: function() {
3434
ok(shouldInit, 'init called on instantiation');
3535
},
3636
methodWithParams: function(param1, param2) {
@@ -73,7 +73,7 @@ test('direct usage', function() {
7373

7474
$.widget('ui.testWidget', {
7575
getterSetterVal: 5,
76-
_init: function() {
76+
_create: function() {
7777
ok(shouldInit, 'init called on instantiation');
7878
},
7979
methodWithParams: function(param1, param2) {
@@ -113,7 +113,7 @@ test('direct usage', function() {
113113
test('merge multiple option arguments', function() {
114114
expect(1);
115115
$.widget("ui.testWidget", {
116-
_init: function() {
116+
_create: function() {
117117
same(this.options, {
118118
disabled: false,
119119
option1: "value1",
@@ -148,7 +148,7 @@ test('merge multiple option arguments', function() {
148148

149149
test(".widget() - base", function() {
150150
$.widget("ui.testWidget", {
151-
_init: function() {}
151+
_create: function() {}
152152
});
153153
var div = $("<div></div>").testWidget()
154154
same(div[0], div.testWidget("widget")[0]);
@@ -157,7 +157,7 @@ test(".widget() - base", function() {
157157
test(".widget() - overriden", function() {
158158
var wrapper = $("<div></div>");
159159
$.widget("ui.testWidget", {
160-
_init: function() {},
160+
_create: function() {},
161161
widget: function() {
162162
return wrapper;
163163
}

‎ui/jquery.ui.accordion.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ $.widget("ui.accordion", {
3232
return this.href.toLowerCase() == location.href.toLowerCase();
3333
}
3434
},
35-
_init: function() {
35+
_create: function() {
3636

3737
var o = this.options, self = this;
3838
this.running = 0;

‎ui/jquery.ui.autocomplete.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ $.widget("ui.autocomplete", {
1818
minLength: 1,
1919
delay: 300
2020
},
21-
_init: function() {
21+
_create: function() {
2222
var self = this;
2323
this.element
2424
.addClass("ui-autocomplete ui-widget ui-widget-content ui-corner-all")
@@ -296,7 +296,7 @@ $.extend($.ui.autocomplete, {
296296
(function($) {
297297

298298
$.widget("ui.menu", {
299-
_init: function() {
299+
_create: function() {
300300
var self = this;
301301
this.element
302302
.addClass("ui-menu ui-widget ui-widget-content ui-corner-all")

‎ui/jquery.ui.button.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ $.widget("ui.button", {
2727
secondary: null
2828
}
2929
},
30-
_init: function() {
30+
_create: function() {
3131
this._determineButtonType();
3232
this.hasTitle = !!this.buttonElement.attr('title');
3333

@@ -208,7 +208,7 @@ $.widget("ui.button", {
208208
});
209209

210210
$.widget("ui.buttonset", {
211-
_init: function() {
211+
_create: function() {
212212
this.element.addClass("ui-button-set");
213213
this.buttons = this.element.find(':button, :submit, :reset, :checkbox, :radio, a, .ui-button')
214214
.button()

‎ui/jquery.ui.dialog.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ $.widget("ui.dialog", {
4848
width: 300,
4949
zIndex: 1000
5050
},
51-
_init: function() {
51+
_create: function() {
5252
this.originalTitle = this.element.attr('title');
5353

5454
var self = this,

‎ui/jquery.ui.draggable.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ $.widget("ui.draggable", $.ui.mouse, {
4141
stack: false,
4242
zIndex: false
4343
},
44-
_init: function() {
44+
_create: function() {
4545

4646
if (this.options.helper == 'original' && !(/^(?:r|a|f)/).test(this.element.css("position")))
4747
this.element[0].style.position = 'relative';

‎ui/jquery.ui.droppable.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ $.widget("ui.droppable", {
2626
scope: 'default',
2727
tolerance: 'intersect'
2828
},
29-
_init: function() {
29+
_create: function() {
3030

3131
var o = this.options, accept = o.accept;
3232
this.isover = 0; this.isout = 1;

‎ui/jquery.ui.progressbar.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ $.widget("ui.progressbar", {
1717
options: {
1818
value: 0
1919
},
20-
_init: function() {
20+
_create: function() {
2121

2222
this.element
2323
.addClass("ui-progressbar"

‎ui/jquery.ui.resizable.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ $.widget("ui.resizable", $.ui.mouse, {
3333
minWidth: 10,
3434
zIndex: 1000
3535
},
36-
_init: function() {
36+
_create: function() {
3737

3838
var self = this, o = this.options;
3939
this.element.addClass("ui-resizable");

0 commit comments

Comments
 (0)