diff options
| author | John Resig <jeresig@gmail.com> | 2007-03-16 00:00:46 +0000 |
|---|---|---|
| committer | John Resig <jeresig@gmail.com> | 2007-03-16 00:00:46 +0000 |
| commit | 7d0a84193f539d85267d1458aba35a42d7dbd03b (patch) | |
| tree | e3d5e3550cc3f4f1526327e57ba2464cf0ce195b /src | |
| parent | 297a450e05e80e930d53631bb9ae2c3fe09378b7 (diff) | |
| download | jquery-7d0a84193f539d85267d1458aba35a42d7dbd03b.tar.gz jquery-7d0a84193f539d85267d1458aba35a42d7dbd03b.zip | |
Added all the tests for isFunction, fixed bug #1026.
Diffstat (limited to 'src')
| -rw-r--r-- | src/jquery/coreTest.js | 76 | ||||
| -rw-r--r-- | src/jquery/jquery.js | 2 |
2 files changed, 77 insertions, 1 deletions
diff --git a/src/jquery/coreTest.js b/src/jquery/coreTest.js index c20d4068d..aa2932bf3 100644 --- a/src/jquery/coreTest.js +++ b/src/jquery/coreTest.js @@ -19,6 +19,82 @@ test("$()", function() { $('<p>\r\n</p>');
});
+test("isFunction", function() {
+ expect(20);
+
+ // Make sure that false values return false
+ ok( !jQuery.isFunction(), "No Value" );
+ ok( !jQuery.isFunction( null ), "null Value" );
+ ok( !jQuery.isFunction( undefined ), "undefined Value" );
+ ok( !jQuery.isFunction( "" ), "Empty String Value" );
+ ok( !jQuery.isFunction( 0 ), "0 Value" );
+
+ // Check built-ins
+ // Safari uses "(Internal Function)"
+ ok( jQuery.isFunction(String), "String Function" );
+ ok( jQuery.isFunction(Array), "Array Function" );
+ ok( jQuery.isFunction(Object), "Object Function" );
+ ok( jQuery.isFunction(Function), "Function Function" );
+
+ // When stringified, this could be misinterpreted
+ var mystr = "function";
+ ok( !jQuery.isFunction(mystr), "Function String" );
+
+ // When stringified, this could be misinterpreted
+ var myarr = [ "function" ];
+ ok( !jQuery.isFunction(myarr), "Function Array" );
+
+ // When stringified, this could be misinterpreted
+ var myfunction = { "function": "test" };
+ ok( !jQuery.isFunction(myfunction), "Function Object" );
+
+ // Make sure normal functions still work
+ var fn = function(){};
+ ok( jQuery.isFunction(fn), "Normal Function" );
+
+ var obj = document.createElement("object");
+
+ // Firefox says this is a function
+ ok( !jQuery.isFunction(obj), "Object Element" );
+
+ // IE says this is an object
+ ok( jQuery.isFunction(obj.getAttribute), "getAttribute Function" );
+
+ var nodes = document.body.childNodes;
+
+ // Safari says this is a function
+ ok( !jQuery.isFunction(nodes), "childNodes Property" );
+
+ var first = document.body.firstChild;
+
+ // Normal elements are reported ok everywhere
+ ok( !jQuery.isFunction(first), "A normal DOM Element" );
+
+ var input = document.createElement("input");
+ input.type = "text";
+ document.body.appendChild( input );
+
+ // IE says this is an object
+ ok( jQuery.isFunction(input.focus), "A default function property" );
+
+ document.body.removeChild( input );
+
+ // Recursive function calls have lengths and array-like properties
+ function callme(callback){
+ function fn(response){
+ callback(response);
+ }
+
+ ok( jQuery.isFunction(fn), "Recursive Function Call" );
+
+ fn({ some: "data" });
+ };
+
+ callme(function(){
+ callme(function(){});
+ });
+});
+
test("length", function() {
ok( $("div").length == 2, "Get Number of Elements Found" );
});
diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js index cc89fff70..e81b82b51 100644 --- a/src/jquery/jquery.js +++ b/src/jquery/jquery.js @@ -1255,7 +1255,7 @@ jQuery.extend({ // is the only cross-browser way to do this. --John isFunction: function( fn ) { return !!fn && typeof fn != "string" && !fn.nodeName && - typeof fn[0] == "undefined" && /function/i.test( fn + "" ); + fn.constructor != Array && /function/i.test( fn + "" ); }, // check if an element is in a XML document |