jquery / jquery-ui

Source
Commits
Network (288)
Graphs
Tree: 58ae7ce

Downloads

The official jQuery user interface library. — Read more

This URL has Read+Write access

Revert "Use pushStack in widget method. Fixes #5732 - make the widget method maintain the stack"

This reverts commit ea58cd5ac0d852a9c7d7ceadbcbb74006cf9052d.

scottgonzalez (author)

Fri Jul 30 09:38:18 -0700 2010

commit 58ae7ce2fd20fb865c90
tree edba4fc37f64d163273c
parent dffcba0ba6d77413f700

Showing 8 changed files with 8 additions and 39 deletions.

M	tests/unit/autocomplete/autocomplete_methods.js	10 ••••
M	tests/unit/button/button_methods.js	14 •••••
M	tests/unit/dialog/dialog_methods.js	6 •••••
M	tests/unit/widget/widget_core.js	9 ••••
M	ui/jquery.ui.autocomplete.js	2 ••
M	ui/jquery.ui.button.js	2 ••
M	ui/jquery.ui.dialog.js	2 ••
M	ui/jquery.ui.widget.js	2 ••

tests/unit/autocomplete/autocomplete_methods.js

View file @ 58ae7ce

@@ -38,14 +38,6 @@ test("search", function() {
   same( $(".ui-menu .ui-menu-item").length, 2, "only java and javascript for 'ja'" );
   
   $("#autocomplete").autocomplete("destroy");
-});
-
-test("widget", function() {
-  var ac = $("#autocomplete").autocomplete({
-    source: data
-  });
-  same(ac.autocomplete("widget")[0], $(":ui-menu")[0]);
-  same(ac.autocomplete("widget").end()[0], ac[0]);
-});
+})
 
 })(jQuery);

tests/unit/button/button_methods.js

View file @ 58ae7ce

@@ -16,18 +16,4 @@ test("destroy", function() {
   equal( afterHtml, beforeHtml );
 });
 
-test("widget", function() {
-  var submit = $("#submit").button();
-  same(submit.button("widget")[0], submit[0]);
-  same(submit.button("widget").end()[0], submit[0]);
-  
-  var check = $("#check").button();
-  same(check.button("widget")[0], check.next("label")[0]);
-  same(check.button("widget").end()[0], check[0]);
-  
-  var radio = $("#radio01").button();
-  same(radio.button("widget")[0], radio.next("label")[0]);
-  same(radio.button("widget").end()[0], radio[0]);
-});
-
 })(jQuery);

tests/unit/dialog/dialog_methods.js

View file @ 58ae7ce

@@ -130,10 +130,4 @@ test("open", function() {
   ok(dlg().is(':visible') && !dlg().is(':hidden'), 'dialog visible after open method called');
 });
 
-test("widget", function() {
-  var dialog = $('<div></div>').dialog();
-  same(dialog.dialog("widget")[0], dialog.parent()[0]);
-  same(dialog.dialog("widget").end()[0], dialog[0]);
-});
-
 })(jQuery);

tests/unit/widget/widget_core.js

View file @ 58ae7ce

@@ -151,8 +151,7 @@ test(".widget() - base", function() {
     _create: function() {}
   });
   var div = $("<div></div>").testWidget()
-  same(div.testWidget("widget")[0], div[0]);
-  same(div.testWidget("widget").end()[0], div[0]);
+  same(div[0], div.testWidget("widget")[0]);
 });
 
 test(".widget() - overriden", function() {
@@ -160,12 +159,10 @@ test(".widget() - overriden", function() {
   $.widget("ui.testWidget", {
     _create: function() {},
     widget: function() {
-      return this.element.pushStack(wrapper.get());
+      return wrapper;
     }
   });
-  var div = $("<div></div>").testWidget();
-  same(div.testWidget("widget")[0], wrapper[0]);
-  same(div.testWidget("widget").end()[0], div[0]);
+  same(wrapper[0], $("<div></div>").testWidget().testWidget("widget")[0]);
 });
 
 })(jQuery);

ui/jquery.ui.autocomplete.js

View file @ 58ae7ce

@@ -311,7 +311,7 @@ $.widget( "ui.autocomplete", {
   },
 
   widget: function() {
-    return this.element.pushStack(this.menu.element.get());
+    return this.menu.element;
   }
 });
 

ui/jquery.ui.button.js

View file @ 58ae7ce

@@ -210,7 +210,7 @@ $.widget( "ui.button", {
   },
 
   widget: function() {
-    return this.element.pushStack(this.buttonElement.get());
+    return this.buttonElement;
   },
 
   destroy: function() {

ui/jquery.ui.dialog.js

View file @ 58ae7ce

@@ -207,7 +207,7 @@ $.widget("ui.dialog", {
   },
 
   widget: function() {
-    return this.element.pushStack(this.uiDialog.get());
+    return this.uiDialog;
   },
 
   close: function(event) {

ui/jquery.ui.widget.js

View file @ 58ae7ce

@@ -160,7 +160,7 @@ $.Widget.prototype = {
   },
 
   widget: function() {
-    return this.element.pushStack(this.element.get());
+    return this.element;
   },
 
   option: function( key, value ) {

0 notes on commit `58ae7ce` Show line notes below

Please log in to comment.

...	...	@@ -130,10 +130,4 @@ test("open", function() {
130	130	ok(dlg().is(':visible') && !dlg().is(':hidden'), 'dialog visible after open method called');
131	131	});
132	132
133		-test("widget", function() {
134		- var dialog = $('<div></div>').dialog();
135		- same(dialog.dialog("widget")[0], dialog.parent()[0]);
136		- same(dialog.dialog("widget").end()[0], dialog[0]);
137		-});
138		-
139	133	})(jQuery);

...	...	@@ -151,8 +151,7 @@ test(".widget() - base", function() {
151	151	_create: function() {}
152	152	});
153	153	var div = $("<div></div>").testWidget()
154		- same(div.testWidget("widget")[0], div[0]);
155		- same(div.testWidget("widget").end()[0], div[0]);
	154	+ same(div[0], div.testWidget("widget")[0]);
156	155	});
157	156
158	157	test(".widget() - overriden", function() {
...	...	@@ -160,12 +159,10 @@ test(".widget() - overriden", function() {
160	159	$.widget("ui.testWidget", {
161	160	_create: function() {},
162	161	widget: function() {
163		- return this.element.pushStack(wrapper.get());
	162	+ return wrapper;
164	163	}
165	164	});
166		- var div = $("<div></div>").testWidget();
167		- same(div.testWidget("widget")[0], wrapper[0]);
168		- same(div.testWidget("widget").end()[0], div[0]);
	165	+ same(wrapper[0], $("<div></div>").testWidget().testWidget("widget")[0]);
169	166	});
170	167
171	168	})(jQuery);

...	...	@@ -311,7 +311,7 @@ $.widget( "ui.autocomplete", {
311	311	},
312	312
313	313	widget: function() {
314		- return this.element.pushStack(this.menu.element.get());
	314	+ return this.menu.element;
315	315	}
316	316	});
317	317

...	...	@@ -210,7 +210,7 @@ $.widget( "ui.button", {
210	210	},
211	211
212	212	widget: function() {
213		- return this.element.pushStack(this.buttonElement.get());
	213	+ return this.buttonElement;
214	214	},
215	215
216	216	destroy: function() {

...	...	@@ -207,7 +207,7 @@ $.widget("ui.dialog", {
207	207	},
208	208
209	209	widget: function() {
210		- return this.element.pushStack(this.uiDialog.get());
	210	+ return this.uiDialog;
211	211	},
212	212
213	213	close: function(event) {

jquery / jquery-ui

0 notes on commit `58ae7ce` Show line notes below

Your current locale selection: English. Choose another?

Keyboard Shortcuts

Site wide shortcuts

Commit list

Pull request list

Issues

Network Graph

...	...	@@ -38,14 +38,6 @@ test("search", function() {
38	38	same( $(".ui-menu .ui-menu-item").length, 2, "only java and javascript for 'ja'" );
39	39
40	40	$("#autocomplete").autocomplete("destroy");
41		-});
42		-
43		-test("widget", function() {
44		- var ac = $("#autocomplete").autocomplete({
45		- source: data
46		- });
47		- same(ac.autocomplete("widget")[0], $(":ui-menu")[0]);
48		- same(ac.autocomplete("widget").end()[0], ac[0]);
49		-});
	41	+})
50	42
51	43	})(jQuery);

...	...	@@ -16,18 +16,4 @@ test("destroy", function() {
16	16	equal( afterHtml, beforeHtml );
17	17	});
18	18
19		-test("widget", function() {
20		- var submit = $("#submit").button();
21		- same(submit.button("widget")[0], submit[0]);
22		- same(submit.button("widget").end()[0], submit[0]);
23		-
24		- var check = $("#check").button();
25		- same(check.button("widget")[0], check.next("label")[0]);
26		- same(check.button("widget").end()[0], check[0]);
27		-
28		- var radio = $("#radio01").button();
29		- same(radio.button("widget")[0], radio.next("label")[0]);
30		- same(radio.button("widget").end()[0], radio[0]);
31		-});
32		-
33	19	})(jQuery);

...	...	@@ -160,7 +160,7 @@ $.Widget.prototype = {
160	160	},
161	161
162	162	widget: function() {
163		- return this.element.pushStack(this.element.get());
	163	+ return this.element;
164	164	},
165	165
166	166	option: function( key, value ) {

jquery / jquery-ui

0 notes on commit 58ae7ce Show line notes below

Your current locale selection: English. Choose another?

Keyboard Shortcuts

Site wide shortcuts

Commit list

Pull request list

Issues

Network Graph

0 notes on commit `58ae7ce` Show line notes below