library-mirrors/jquery-ui
1
0
Fork 0
mirror of https://github.com/jquery/jquery-ui.git synced 2024-11-21 11:04:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Widget: Throw errors for invalid method calls. Fixes #5972 - Widget: Throw error for non-existent method calls.

Browse Source
This commit is contained in:
Scott González 2010-12-10 14:11:20 -05:00
parent 0e15f573d6
commit 9ad2a4b1cc
2 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tests/unit/widget/widget_core.js
View File

@ -120,6 +120,23 @@ test( "direct usage", function() {
equals( instance.getterSetterVal, 30, "getter/setter can act as setter" );
});
test( "error handling", function() {
expect( 2 );
var error = $.error;
$.widget( "ui.testWidget", {} );
$.error = function( msg ) {
equal( msg, "cannot call methods on testWidget prior to initialization; " +
"attempted to call method 'missing'", "method call before init" );
};
$( "<div>" ).testWidget( "missing" );
$.error = function( msg ) {
equal( msg, "no such method 'missing' for testWidget widget instance",
"invalid method call on widget instance" );
};
$( "<div>" ).testWidget().testWidget( "missing" );
$.error = error;
});
test("merge multiple option arguments", function() {
expect( 1 );
$.widget( "ui.testWidget", {

22
ui/jquery.ui.widget.js vendored
View File

@ -96,19 +96,15 @@ $.widget.bridge = function( name, object ) {
if ( isMethodCall ) {
this.each(function() {
var instance = $.data( this, name ),
methodValue = instance && $.isFunction( instance[options] ) ?
instance[ options ].apply( instance, args ) :
instance;
// TODO: add this back in 1.9 and use $.error() (see #5972)
// if ( !instance ) {
// throw "cannot call methods on " + name + " prior to initialization; " +
// "attempted to call method '" + options + "'";
// }
// if ( !$.isFunction( instance[options] ) ) {
// throw "no such method '" + options + "' for " + name + " widget instance";
// }
// var methodValue = instance[ options ].apply( instance, args );
var instance = $.data( this, name );
if ( !instance ) {
return $.error( "cannot call methods on " + name + " prior to initialization; " +
"attempted to call method '" + options + "'" );
}
if ( !$.isFunction( instance[options] ) ) {
return $.error( "no such method '" + options + "' for " + name + " widget instance" );
}
var methodValue = instance[ options ].apply( instance, args );
if ( methodValue !== instance && methodValue !== undefined ) {
returnValue = methodValue;
return false;