Skip to content

Commit d44557f

Browse files
committed
Widget: Removed dual storage of widget instances. Fixes #8801 - Widget: Remove data fallbacks for widget names.
1 parent 84cd214 commit d44557f

File tree

2 files changed

+6
-15
lines changed

2 files changed

+6
-15
lines changed

tests/unit/widget/widget_core.js

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,9 @@ test( "custom selector expression", function() {
8989
});
9090

9191
test( "jQuery usage", function() {
92-
expect( 16 );
92+
expect( 14 );
9393

94-
var elem, instance, ret, bcInstance,
94+
var elem, instance, ret,
9595
shouldCreate = false;
9696

9797
$.widget( "ui.testWidget", {
@@ -134,12 +134,6 @@ test( "jQuery usage", function() {
134134
ret = elem.testWidget( "methodWithParams", "value1", "value2" );
135135
equal( ret, elem, "jQuery object returned from method call" );
136136

137-
// 1.9 BC for #7810
138-
// TODO remove
139-
bcInstance = elem.data("testWidget");
140-
equal( typeof bcInstance, "object", "instance stored in .data(pluginName)" );
141-
equal( bcInstance.element[0], elem[0], "element stored on widget" );
142-
143137
ret = elem.testWidget( "getterSetterMethod" );
144138
equal( ret, 5, "getter/setter can act as getter" );
145139
ret = elem.testWidget( "getterSetterMethod", 30 );
@@ -837,7 +831,7 @@ test( "_on() to common element", function() {
837831
ok( true, "handler triggered" );
838832
}
839833
});
840-
var widget = $( "#widget" ).testWidget().data( "testWidget" );
834+
var widget = $( "#widget" ).testWidget().data( "ui-testWidget" );
841835
$( "#widget-wrapper" ).testWidget();
842836
widget.destroy();
843837
$( document ).trigger( "customevent" );
@@ -849,7 +843,7 @@ test( "_off() - single event", function() {
849843
$.widget( "ui.testWidget", {} );
850844
var shouldTriggerWidget, shouldTriggerOther,
851845
element = $( "#widget" ),
852-
widget = element.testWidget().data( "testWidget" );
846+
widget = element.testWidget().data( "ui-testWidget" );
853847
widget._on( element, { foo: function() {
854848
ok( shouldTriggerWidget, "foo called from _on" );
855849
}});
@@ -870,7 +864,7 @@ test( "_off() - multiple events", function() {
870864
$.widget( "ui.testWidget", {} );
871865
var shouldTriggerWidget, shouldTriggerOther,
872866
element = $( "#widget" ),
873-
widget = element.testWidget().data( "testWidget" );
867+
widget = element.testWidget().data( "ui-testWidget" );
874868
widget._on( element, {
875869
foo: function() {
876870
ok( shouldTriggerWidget, "foo called from _on" );
@@ -898,7 +892,7 @@ test( "_off() - all events", function() {
898892
$.widget( "ui.testWidget", {} );
899893
var shouldTriggerWidget, shouldTriggerOther,
900894
element = $( "#widget" ),
901-
widget = element.testWidget().data( "testWidget" );
895+
widget = element.testWidget().data( "ui-testWidget" );
902896
widget._on( element, {
903897
foo: function() {
904898
ok( shouldTriggerWidget, "foo called from _on" );

ui/jquery.ui.widget.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -231,9 +231,6 @@ $.Widget.prototype = {
231231
this.focusable = $();
232232

233233
if ( element !== this ) {
234-
// 1.9 BC for #7810
235-
// TODO remove dual storage
236-
$.data( element, this.widgetName, this );
237234
$.data( element, this.widgetFullName, this );
238235
this._on( this.element, {
239236
remove: function( event ) {

0 commit comments

Comments
 (0)