Skip to content

Commit

Permalink
Revert "Use pushStack in widget method. Fixes #5732 - make the widget…
Browse files Browse the repository at this point in the history
… method maintain the stack"

This reverts commit ea58cd5.
  • Loading branch information
scottgonzalez committed Jul 30, 2010
1 parent dffcba0 commit 58ae7ce
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 39 deletions.
10 changes: 1 addition & 9 deletions tests/unit/autocomplete/autocomplete_methods.js
Expand Up @@ -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);
14 changes: 0 additions & 14 deletions tests/unit/button/button_methods.js
Expand Up @@ -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);
6 changes: 0 additions & 6 deletions tests/unit/dialog/dialog_methods.js
Expand Up @@ -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);
9 changes: 3 additions & 6 deletions tests/unit/widget/widget_core.js
Expand Up @@ -151,21 +151,18 @@ 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() {
var wrapper = $("<div></div>");
$.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);
2 changes: 1 addition & 1 deletion ui/jquery.ui.autocomplete.js
Expand Up @@ -311,7 +311,7 @@ $.widget( "ui.autocomplete", {
},

widget: function() {
return this.element.pushStack(this.menu.element.get());
return this.menu.element;
}
});

Expand Down
2 changes: 1 addition & 1 deletion ui/jquery.ui.button.js
Expand Up @@ -210,7 +210,7 @@ $.widget( "ui.button", {
},

widget: function() {
return this.element.pushStack(this.buttonElement.get());
return this.buttonElement;
},

destroy: function() {
Expand Down
2 changes: 1 addition & 1 deletion ui/jquery.ui.dialog.js
Expand Up @@ -207,7 +207,7 @@ $.widget("ui.dialog", {
},

widget: function() {
return this.element.pushStack(this.uiDialog.get());
return this.uiDialog;
},

close: function(event) {
Expand Down
2 changes: 1 addition & 1 deletion ui/jquery.ui.widget.js
Expand Up @@ -160,7 +160,7 @@ $.Widget.prototype = {
},

widget: function() {
return this.element.pushStack(this.element.get());
return this.element;
},

option: function( key, value ) {
Expand Down

0 comments on commit 58ae7ce

Please sign in to comment.