From: Scott González Date: Fri, 14 Jan 2011 22:11:22 +0000 (-0500) Subject: Change destroy to _destroy and remove calls to $.Widget.prototype.destroy in widgets... X-Git-Tag: 1.9m4~53 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=56c4c6aca992e1a441e6a2b498c911cf8d2221a4;p=jquery-ui.git Change destroy to _destroy and remove calls to $.Widget.prototype.destroy in widgets with simple destroy methods. --- diff --git a/ui/jquery.ui.accordion.js b/ui/jquery.ui.accordion.js index a31abd198..c0e187c58 100644 --- a/ui/jquery.ui.accordion.js +++ b/ui/jquery.ui.accordion.js @@ -140,7 +140,7 @@ $.widget( "ui.accordion", { this.element.removeClass( "ui-accordion-icons" ); }, - destroy: function() { + _destroy: function() { var options = this.options; this.element @@ -164,8 +164,6 @@ $.widget( "ui.accordion", { if ( options.heightStyle !== "content" ) { contents.css( "height", "" ); } - - return $.Widget.prototype.destroy.call( this ); }, _setOption: function( key, value ) { diff --git a/ui/jquery.ui.autocomplete.js b/ui/jquery.ui.autocomplete.js index f48dc032a..0413306ce 100644 --- a/ui/jquery.ui.autocomplete.js +++ b/ui/jquery.ui.autocomplete.js @@ -214,7 +214,7 @@ $.widget( "ui.autocomplete", { } }, - destroy: function() { + _destroy: function() { this.element .removeClass( "ui-autocomplete-input" ) .removeAttr( "autocomplete" ) @@ -222,7 +222,6 @@ $.widget( "ui.autocomplete", { .removeAttr( "aria-autocomplete" ) .removeAttr( "aria-haspopup" ); this.menu.element.remove(); - $.Widget.prototype.destroy.call( this ); }, _setOption: function( key, value ) { diff --git a/ui/jquery.ui.button.js b/ui/jquery.ui.button.js index 78134e308..71d8cad12 100644 --- a/ui/jquery.ui.button.js +++ b/ui/jquery.ui.button.js @@ -218,7 +218,7 @@ $.widget( "ui.button", { return this.buttonElement; }, - destroy: function() { + _destroy: function() { this.element .removeClass( "ui-helper-hidden-accessible" ); this.buttonElement @@ -230,8 +230,6 @@ $.widget( "ui.button", { if ( !this.hasTitle ) { this.buttonElement.removeAttr( "title" ); } - - $.Widget.prototype.destroy.call( this ); }, _setOption: function( key, value ) { diff --git a/ui/jquery.ui.dialog.js b/ui/jquery.ui.dialog.js index e2b857723..50c2bb905 100644 --- a/ui/jquery.ui.dialog.js +++ b/ui/jquery.ui.dialog.js @@ -179,7 +179,7 @@ $.widget("ui.dialog", { } }, - destroy: function() { + _destroy: function() { var self = this; if ( self.overlay ) { @@ -195,9 +195,6 @@ $.widget("ui.dialog", { if ( self.originalTitle ) { self.element.attr( "title", self.originalTitle ); } - - $.Widget.prototype.destroy.call( this ); - return self; }, widget: function() { diff --git a/ui/jquery.ui.menu.js b/ui/jquery.ui.menu.js index 6381bedbc..b48b549fd 100644 --- a/ui/jquery.ui.menu.js +++ b/ui/jquery.ui.menu.js @@ -93,9 +93,7 @@ $.widget("ui.menu", { }); }, - destroy: function() { - $.Widget.prototype.destroy.apply( this, arguments ); - + _destroy: function() { this.element .removeClass( "ui-menu ui-widget ui-widget-content ui-corner-all" ) .removeAttr( "tabIndex" ) diff --git a/ui/jquery.ui.progressbar.js b/ui/jquery.ui.progressbar.js index 009049d27..ade258bee 100644 --- a/ui/jquery.ui.progressbar.js +++ b/ui/jquery.ui.progressbar.js @@ -38,7 +38,7 @@ $.widget( "ui.progressbar", { this._refreshValue(); }, - destroy: function() { + _destroy: function() { this.element .removeClass( "ui-progressbar ui-widget ui-widget-content ui-corner-all" ) .removeAttr( "role" ) @@ -47,8 +47,6 @@ $.widget( "ui.progressbar", { .removeAttr( "aria-valuenow" ); this.valueDiv.remove(); - - $.Widget.prototype.destroy.apply( this, arguments ); }, value: function( newValue ) { diff --git a/ui/jquery.ui.tooltip.js b/ui/jquery.ui.tooltip.js index ea3cde339..fd0faceae 100644 --- a/ui/jquery.ui.tooltip.js +++ b/ui/jquery.ui.tooltip.js @@ -58,9 +58,8 @@ $.widget("ui.tooltip", { this.options.disabled = true; }, - destroy: function() { + _destroy: function() { this.tooltip.remove(); - $.Widget.prototype.destroy.apply(this, arguments); }, widget: function() {