diff --git a/tests/unit/widget/widget_core.js b/tests/unit/widget/widget_core.js index b92885fd9..11325140f 100644 --- a/tests/unit/widget/widget_core.js +++ b/tests/unit/widget/widget_core.js @@ -166,9 +166,11 @@ test( "direct usage", function() { }); test( "error handling", function() { - expect( 2 ); + expect( 3 ); var error = $.error; - $.widget( "ui.testWidget", {} ); + $.widget( "ui.testWidget", { + _privateMethod: function () {} + }); $.error = function( msg ) { equal( msg, "cannot call methods on testWidget prior to initialization; " + "attempted to call method 'missing'", "method call before init" ); @@ -179,6 +181,11 @@ test( "error handling", function() { "invalid method call on widget instance" ); }; $( "
" ).testWidget().testWidget( "missing" ); + $.error = function ( msg ) { + equal( msg, "no such method '_privateMethod' for testWidget widget instance", + "invalid method call on widget instance" ); + }; + $( "
" ).testWidget().testWidget( "_privateMethod" ); $.error = error; }); diff --git a/ui/jquery.ui.widget.js b/ui/jquery.ui.widget.js index 0a4759023..10a25b611 100644 --- a/ui/jquery.ui.widget.js +++ b/ui/jquery.ui.widget.js @@ -104,11 +104,6 @@ $.widget.bridge = function( name, object ) { $.extend.apply( null, [ true, options ].concat(args) ) : options; - // prevent calls to internal methods - if ( isMethodCall && options.charAt( 0 ) === "_" ) { - return returnValue; - } - if ( isMethodCall ) { this.each(function() { var instance = $.data( this, name ); @@ -116,7 +111,7 @@ $.widget.bridge = function( name, object ) { return $.error( "cannot call methods on " + name + " prior to initialization; " + "attempted to call method '" + options + "'" ); } - if ( !$.isFunction( instance[options] ) ) { + if ( !$.isFunction( instance[options] ) || options.charAt( 0 ) === "_" ) { return $.error( "no such method '" + options + "' for " + name + " widget instance" ); } var methodValue = instance[ options ].apply( instance, args );