Change destroy to _destroy and remove calls to $.Widget.prototype.destroy in widgets...

diff --git a/ui/jquery.ui.accordion.js b/ui/jquery.ui.accordion.js
index a31abd198a58746d82caa7a345585946feb4e2ed..c0e187c585362a9fb2e434d0a1f20ba8e0152ce8 100644 (file)
--- 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 f48dc032afd44dbe5107a944fe838a6e29e7019b..0413306cebcae7fe2d536626f59406eb4861b938 100644 (file)
--- 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 78134e30866e376ed4677406cce095768721319c..71d8cad128ed70e43117fe5d2b2d5072a90b1c41 100644 (file)
--- 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 e2b8577238ecf8f0e915d71b916e12c422491485..50c2bb905fb280a6dd7c350b53ef2135273c34ae 100644 (file)
--- 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 6381bedbc74be3c7101c0646c22cfbeb8cc456dc..b48b549fde442bddd56eb4216b361643c2566150 100644 (file)
--- 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 009049d275cac0de929bbbfafed40bac610f28c9..ade258bee17b30292a5dad58d7a0163026cc2c01 100644 (file)
--- 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 ea3cde3395c299de072acd528328e94a40aa03a8..fd0faceae664e44aa6933fbc9c289ed290fd06e2 100644 (file)
--- 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() {