Skip to content
Permalink
Browse files

Update Widget data naming/usage. Remove unnecessary fallbacks, update…

… .removeData to use full name.
  • Loading branch information
jzaefferer committed Mar 1, 2012
1 parent d901cd4 commit 5e51b8db284b23bf818148051aaf5b41a7b9c7b1
Showing with 7 additions and 8 deletions.
  1. +4 −1 tests/unit/widget/widget_core.js
  2. +3 −7 ui/jquery.ui.widget.js
@@ -82,7 +82,7 @@ test( "custom selector expression", function() {
});

test( "jQuery usage", function() {
expect( 15 );
expect( 16 );

var shouldCreate = false;

@@ -140,6 +140,9 @@ test( "jQuery usage", function() {
ret = elem.testWidget( "jQueryObject" );
equal( ret[ 0 ], document.body, "returned jQuery object" );
equal( ret.end(), elem, "stack preserved" );

elem.testWidget( "destroy" );
equal( elem.data( "ui-testWidget" ), null );
});

test( "direct usage", function() {
@@ -163,9 +163,7 @@ $.widget.bridge = function( name, object ) {

if ( isMethodCall ) {
this.each(function() {
// 1.9 BC for #7810
// TODO remove fallback to name
var instance = $.data( this, fullName ) || $.data( this, name );
var instance = $.data( this, fullName );
if ( !instance ) {
return $.error( "cannot call methods on " + name + " prior to initialization; " +
"attempted to call method '" + options + "'" );
@@ -183,9 +181,7 @@ $.widget.bridge = function( name, object ) {
});
} else {
this.each(function() {
// 1.9 BC for #7810
// TODO remove fallback to name
var instance = $.data( this, fullName ) || $.data( this, name );
var instance = $.data( this, fullName );
if ( instance ) {
instance.option( options || {} )._init();
} else {
@@ -252,7 +248,7 @@ $.Widget.prototype = {
// all event bindings should go through this._bind()
this.element
.unbind( "." + this.widgetName )
.removeData( this.widgetName );
.removeData( this.widgetFullName );
this.widget()
.unbind( "." + this.widgetName )
.removeAttr( "aria-disabled" )

0 comments on commit 5e51b8d

Please sign in to comment.
You can’t perform that action at this time.