jquery / jquery-ui

Source
Commits
Network (268)
Graphs
Tree: 1e28040

The official jQuery user interface library. — Read more

This URL has Read+Write access

Widget: Throw errors when calling non-existent methods or methods on uninistantiated widgets. Fixes #5972 - Widget: Throw error for non-existent method calls.

scottgonzalez (author)

Fri Aug 27 11:48:17 -0700 2010

commit 1e28040cf358d0fe81ee
tree 721a02ecfcfb52284e0d
parent 52a052be79d21aa519cc

M	tests/unit/accordion/accordion_methods.js	3 •••
M	tests/unit/dialog/dialog_core.js	17 •••••
M	tests/unit/dialog/dialog_methods.js	8 ••••
M	tests/unit/slider/slider.html	1 •
M	tests/unit/slider/slider_methods.js	8 ••••
M	ui/jquery.ui.widget.js	13 ••••

tests/unit/accordion/accordion_methods.js

View file @ 1e28040

@@ -18,9 +18,6 @@ test("init", function() {
   $('<div></div>').appendTo('body').remove().accordion().remove();
   ok(true, '.accordion() called on disconnected DOMElement - removed');
 
-  $('<div></div>').accordion().accordion("foo").remove();
-  ok(true, 'arbitrary method called after init');
-
   var el = $('<div></div>').accordion();
   var foo = el.accordion("option", "foo");
   el.remove();

tests/unit/dialog/dialog_core.js

View file @ 1e28040

@@ -88,23 +88,6 @@ function margin(el, side) {
 
 module("dialog: core");
 
-test("element types", function() {
-  var typeNames = ('p,h1,h2,h3,h4,h5,h6,blockquote,ol,ul,dl,div,form'
-    + ',table,fieldset,address,ins,del,em,strong,q,cite,dfn,abbr'
-    + ',acronym,code,samp,kbd,var,img,object,hr'
-    + ',input,button,label,select,iframe').split(',');
-
-  $.each(typeNames, function(i) {
-    var typeName = typeNames[i];
-    el = $(document.createElement(typeName)).appendTo('body');
-    (typeName == 'table' && el.append("<tr><td>content</td></tr>"));
-    el.dialog();
-    ok(true, '$("&lt;' + typeName + '/&gt").dialog()');
-    el.dialog("destroy");
-    el.remove();
-  });
-});
-
 test("title id", function() {
   expect(3);
 

tests/unit/dialog/dialog_methods.js

View file @ 1e28040

@@ -10,7 +10,7 @@ module("dialog: methods", {
 });
 
 test("init", function() {
-  expect(7);
+  expect(6);
 
   $("<div></div>").appendTo('body').dialog().remove();
   ok(true, '.dialog() called on element');
@@ -24,9 +24,6 @@ test("init", function() {
   $('<div></div>').appendTo('body').remove().dialog().remove();
   ok(true, '.dialog() called on disconnected DOMElement - removed');
 
-  $('<div></div>').dialog().dialog("foo").remove();
-  ok(true, 'arbitrary method called after init');
-
   el = $('<div></div>').dialog();
   var foo = el.dialog("option", "foo");
   el.remove();
@@ -46,9 +43,6 @@ test("destroy", function() {
   $('<div></div>').dialog().dialog("destroy").remove();
   ok(true, '.dialog("destroy") called on disconnected DOMElement');
 
-  $('<div></div>').dialog().dialog("destroy").dialog("foo").remove();
-  ok(true, 'arbitrary method called after destroy');
-
   var expected = $('<div></div>').dialog(),
     actual = expected.dialog('destroy');
   equals(actual, expected, 'destroy is chainable');

tests/unit/slider/slider.html

View file @ 1e28040

@@ -15,6 +15,7 @@
   <link rel="stylesheet" href="../../../external/qunit.css" type="text/css"/>
   <script type="text/javascript" src="../../../external/qunit.js"></script>
   <script type="text/javascript" src="../../jquery.simulate.js"></script>
+  <script type="text/javascript" src="../testsuite.js"></script>
 
   <script type="text/javascript" src="slider_core.js"></script>
   <script type="text/javascript" src="slider_defaults.js"></script>

tests/unit/slider/slider_methods.js

View file @ 1e28040

@@ -6,7 +6,7 @@
 module("slider: methods");
 
 test("init", function() {
-  expect(6);
+  expect(5);
 
   $("<div></div>").appendTo('body').slider().remove();
   ok(true, '.slider() called on element');
@@ -17,9 +17,6 @@ test("init", function() {
   $('<div></div>').slider().remove();
   ok(true, '.slider() called on disconnected DOMElement');
 
-  $('<div></div>').slider().slider("foo").remove();
-  ok(true, 'arbitrary method called after init');
-
   var el = $('<div></div>').slider();
   var foo = el.slider("option", "foo");
   el.remove();
@@ -39,9 +36,6 @@ test("destroy", function() {
   $('<div></div>').appendTo('body').remove().slider().slider("destroy").remove();
   ok(true, '.slider("destroy") called on disconnected DOMElement');
 
-  $('<div></div>').slider().slider("destroy").slider("foo").remove();
-  ok(true, 'arbitrary method called after destroy');
-
   var expected = $('<div></div>').slider(),
     actual = expected.slider('destroy');
   equals(actual, expected, 'destroy is chainable');

ui/jquery.ui.widget.js

View file @ 1e28040

@@ -86,10 +86,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;
+        var instance = $.data( this, name );
+        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 );
         if ( methodValue !== instance && methodValue !== undefined ) {
           returnValue = methodValue;
           return false;

2 notes on commit `1e28040` Show line notes below

jzaefferer added a note to 1e28040 repo collab

Sun Aug 29 02:44:10 -0700 2010

I think it would be even more useful to do throw new Error("[message]") - that way the exception will contain fileName and lineNumber properties, making debugging even easier.

A quick Firebug test seems to confirm that, but I'm actually not sure about the exact semantics of throw and Error...

scottgonzalez added a note to 1e28040 repo collab

Mon Aug 30 05:40:20 -0700 2010

I did this for consistency with core. We could make this change and see about getting it into core as well.

Please log in to comment.

...	...	@@ -88,23 +88,6 @@ function margin(el, side) {
88	88
89	89	module("dialog: core");
90	90
91		-test("element types", function() {
92		- var typeNames = ('p,h1,h2,h3,h4,h5,h6,blockquote,ol,ul,dl,div,form'
93		- + ',table,fieldset,address,ins,del,em,strong,q,cite,dfn,abbr'
94		- + ',acronym,code,samp,kbd,var,img,object,hr'
95		- + ',input,button,label,select,iframe').split(',');
96		-
97		- $.each(typeNames, function(i) {
98		- var typeName = typeNames[i];
99		- el = $(document.createElement(typeName)).appendTo('body');
100		- (typeName == 'table' && el.append("<tr><td>content</td></tr>"));
101		- el.dialog();
102		- ok(true, '$("<' + typeName + '/&gt").dialog()');
103		- el.dialog("destroy");
104		- el.remove();
105		- });
106		-});
107		-
108	91	test("title id", function() {
109	92	expect(3);
110	93

jquery / jquery-ui

2 notes on commit `1e28040` Show line notes below

Your current locale selection: English. Choose another?

Keyboard Shortcuts

Site wide shortcuts

Commit list

Pull request list

Issues

Network Graph

...	...	@@ -18,9 +18,6 @@ test("init", function() {
18	18	$('<div></div>').appendTo('body').remove().accordion().remove();
19	19	ok(true, '.accordion() called on disconnected DOMElement - removed');
20	20
21		- $('<div></div>').accordion().accordion("foo").remove();
22		- ok(true, 'arbitrary method called after init');
23		-
24	21	var el = $('<div></div>').accordion();
25	22	var foo = el.accordion("option", "foo");
26	23	el.remove();

...	...	@@ -10,7 +10,7 @@ module("dialog: methods", {
10	10	});
11	11
12	12	test("init", function() {
13		- expect(7);
	13	+ expect(6);
14	14
15	15	$("<div></div>").appendTo('body').dialog().remove();
16	16	ok(true, '.dialog() called on element');
...	...	@@ -24,9 +24,6 @@ test("init", function() {
24	24	$('<div></div>').appendTo('body').remove().dialog().remove();
25	25	ok(true, '.dialog() called on disconnected DOMElement - removed');
26	26
27		- $('<div></div>').dialog().dialog("foo").remove();
28		- ok(true, 'arbitrary method called after init');
29		-
30	27	el = $('<div></div>').dialog();
31	28	var foo = el.dialog("option", "foo");
32	29	el.remove();
...	...	@@ -46,9 +43,6 @@ test("destroy", function() {
46	43	$('<div></div>').dialog().dialog("destroy").remove();
47	44	ok(true, '.dialog("destroy") called on disconnected DOMElement');
48	45
49		- $('<div></div>').dialog().dialog("destroy").dialog("foo").remove();
50		- ok(true, 'arbitrary method called after destroy');
51		-
52	46	var expected = $('<div></div>').dialog(),
53	47	actual = expected.dialog('destroy');
54	48	equals(actual, expected, 'destroy is chainable');

...	...	@@ -15,6 +15,7 @@
15	15	<link rel="stylesheet" href="../../../external/qunit.css" type="text/css"/>
16	16	<script type="text/javascript" src="../../../external/qunit.js"></script>
17	17	<script type="text/javascript" src="../../jquery.simulate.js"></script>
	18	+ <script type="text/javascript" src="../testsuite.js"></script>
18	19
19	20	<script type="text/javascript" src="slider_core.js"></script>
20	21	<script type="text/javascript" src="slider_defaults.js"></script>

...	...	@@ -6,7 +6,7 @@
6	6	module("slider: methods");
7	7
8	8	test("init", function() {
9		- expect(6);
	9	+ expect(5);
10	10
11	11	$("<div></div>").appendTo('body').slider().remove();
12	12	ok(true, '.slider() called on element');
...	...	@@ -17,9 +17,6 @@ test("init", function() {
17	17	$('<div></div>').slider().remove();
18	18	ok(true, '.slider() called on disconnected DOMElement');
19	19
20		- $('<div></div>').slider().slider("foo").remove();
21		- ok(true, 'arbitrary method called after init');
22		-
23	20	var el = $('<div></div>').slider();
24	21	var foo = el.slider("option", "foo");
25	22	el.remove();
...	...	@@ -39,9 +36,6 @@ test("destroy", function() {
39	36	$('<div></div>').appendTo('body').remove().slider().slider("destroy").remove();
40	37	ok(true, '.slider("destroy") called on disconnected DOMElement');
41	38
42		- $('<div></div>').slider().slider("destroy").slider("foo").remove();
43		- ok(true, 'arbitrary method called after destroy');
44		-
45	39	var expected = $('<div></div>').slider(),
46	40	actual = expected.slider('destroy');
47	41	equals(actual, expected, 'destroy is chainable');

...	...	@@ -86,10 +86,15 @@ $.widget.bridge = function( name, object ) {
86	86
87	87	if ( isMethodCall ) {
88	88	this.each(function() {
89		- var instance = $.data( this, name ),
90		- methodValue = instance && $.isFunction( instance[options] ) ?
91		- instance[ options ].apply( instance, args ) :
92		- instance;
	89	+ var instance = $.data( this, name );
	90	+ if ( !instance ) {
	91	+ throw "cannot call methods on " + name + " prior to initialization; " +
	92	+ "attempted to call method '" + options + "'";
	93	+ }
	94	+ if ( !$.isFunction( instance[options] ) ) {
	95	+ throw "no such method '" + options + "' for " + name + " widget instance";
	96	+ }
	97	+ var methodValue = instance[ options ].apply( instance, args );
93	98	if ( methodValue !== instance && methodValue !== undefined ) {
94	99	returnValue = methodValue;
95	100	return false;

jquery / jquery-ui

2 notes on commit 1e28040 Show line notes below

Your current locale selection: English. Choose another?

Keyboard Shortcuts

Site wide shortcuts

Commit list

Pull request list

Issues

Network Graph

2 notes on commit `1e28040` Show line notes below