Widget: Removed dual storage of widget instances. Fixes #8801 - Widget: Remove data...

diff --git a/tests/unit/widget/widget_core.js b/tests/unit/widget/widget_core.js
index 9180072e3f062c792cad08028f091048452d4742..b0812638a2eb35a849ffaef87b446f0cf334c244 100644 (file)
--- a/tests/unit/widget/widget_core.js
+++ b/tests/unit/widget/widget_core.js
@@ -89,9 +89,9 @@ test( "custom selector expression", function() {
 });
 
 test( "jQuery usage", function() {
-       expect( 16 );
+       expect( 14 );
 
-       var elem, instance, ret, bcInstance,
+       var elem, instance, ret,
                shouldCreate = false;
 
        $.widget( "ui.testWidget", {
@@ -134,12 +134,6 @@ test( "jQuery usage", function() {
        ret = elem.testWidget( "methodWithParams", "value1", "value2" );
        equal( ret, elem, "jQuery object returned from method call" );
 
-       // 1.9 BC for #7810
-       // TODO remove
-       bcInstance = elem.data("testWidget");
-       equal( typeof bcInstance, "object", "instance stored in .data(pluginName)" );
-       equal( bcInstance.element[0], elem[0], "element stored on widget" );
-
        ret = elem.testWidget( "getterSetterMethod" );
        equal( ret, 5, "getter/setter can act as getter" );
        ret = elem.testWidget( "getterSetterMethod", 30 );
@@ -837,7 +831,7 @@ test( "_on() to common element", function() {
                        ok( true, "handler triggered" );
                }
        });
-       var widget = $( "#widget" ).testWidget().data( "testWidget" );
+       var widget = $( "#widget" ).testWidget().data( "ui-testWidget" );
        $( "#widget-wrapper" ).testWidget();
        widget.destroy();
        $( document ).trigger( "customevent" );
@@ -849,7 +843,7 @@ test( "_off() - single event", function() {
        $.widget( "ui.testWidget", {} );
        var shouldTriggerWidget, shouldTriggerOther,
                element = $( "#widget" ),
-               widget = element.testWidget().data( "testWidget" );
+               widget = element.testWidget().data( "ui-testWidget" );
        widget._on( element, { foo: function() {
                ok( shouldTriggerWidget, "foo called from _on" );
        }});
@@ -870,7 +864,7 @@ test( "_off() - multiple events", function() {
        $.widget( "ui.testWidget", {} );
        var shouldTriggerWidget, shouldTriggerOther,
                element = $( "#widget" ),
-               widget = element.testWidget().data( "testWidget" );
+               widget = element.testWidget().data( "ui-testWidget" );
        widget._on( element, {
                foo: function() {
                        ok( shouldTriggerWidget, "foo called from _on" );
@@ -898,7 +892,7 @@ test( "_off() - all events", function() {
        $.widget( "ui.testWidget", {} );
        var shouldTriggerWidget, shouldTriggerOther,
                element = $( "#widget" ),
-               widget = element.testWidget().data( "testWidget" );
+               widget = element.testWidget().data( "ui-testWidget" );
        widget._on( element, {
                foo: function() {
                        ok( shouldTriggerWidget, "foo called from _on" );

diff --git a/ui/jquery.ui.widget.js b/ui/jquery.ui.widget.js
index 83696e94050477bf05d5b332258d916e9bdd9fd0..65ac155ae407471eb03672f01207143ecbb7f28a 100644 (file)
--- a/ui/jquery.ui.widget.js
+++ b/ui/jquery.ui.widget.js
@@ -231,9 +231,6 @@ $.Widget.prototype = {
                this.focusable = $();
 
                if ( element !== this ) {
-                       // 1.9 BC for #7810
-                       // TODO remove dual storage
-                       $.data( element, this.widgetName, this );
                        $.data( element, this.widgetFullName, this );
                        this._on( this.element, {
                                remove: function( event ) {