Changeset 5318

Timestamp:

04/25/08 03:48:07 (7 months ago)

Author:

aflesler

Message:

jquery core: fixed makeArray to recognize the window (has length)
test runner: updated the tests for makeArray

Location:

trunk/jquery

Files:

• src/core.js (modified) (1 diff)
• test/unit/core.js (modified) (3 diffs)

trunk/jquery/src/core.js

@@ -1115 +1115 @@
         var ret = [];
 
-        if( array != undefined )
-            //strings and functions also have 'length'
-            if( array.length != undefined && !array.split && !array.call )
-                for( var i = array.length; i; )
+        if( array != undefined ){
+            var i = array.length;
+            //the window, strings and functions also have 'length'
+            if( i != undefined && typeof array == 'object' && array != window )
+                while( i )
                     ret[--i] = array[i];
             else
                 ret[0] = array;
+        }
 
         return ret;

trunk/jquery/test/unit/core.js

@@ -1564 +1564 @@
 
 test("$.makeArray", function(){
-    expect(11);
+    expect(13);
     
     equals( $.makeArray(document.getElementsByName("PWD")).slice(0,1)[0].name, "PWD", "Pass makeArray a nodelist" );
@@ -1578 +1578 @@
     equals( $.makeArray( "foo" )[0], "foo", "Pass makeArray a string" );
 
-    equals( typeof $.makeArray( true )[0], "boolean", "Pass makeArray a boolean" );
+    equals( $.makeArray( true )[0].constructor, Boolean, "Pass makeArray a boolean" );
 
     equals( $.makeArray( document.createElement("div") )[0].nodeName, "DIV", "Pass makeArray a single node" );
@@ -1584 +1584 @@
     equals( $.makeArray( {length:2, 0:"a", 1:"b"} ).join(""), "ab", "Pass makeArray an array like map (with length)" );
 
-    equals( $.makeArray( document.documentElement.childNodes ).slice(0,1)[0].nodeName, "HEAD", "Pass makeArray a childNodeson array" );
-
-    //function (tricky, they have length)
-    equals( $.makeArray( function(){ return 1;} )[0](), 1, "Pass makeArray a function" );   
-});
+    equals( $.makeArray( document.documentElement.childNodes ).slice(0,1)[0].nodeName, "HEAD", "Pass makeArray a childNodes array" );
+
+    //function, is tricky as it has length
+    equals( $.makeArray( function(){ return 1;} )[0](), 1, "Pass makeArray a function" );
+    //window, also has length
+    equals( $.makeArray(window)[0], window, "Pass makeArray the window" );
+    
+    equals( $.makeArray(/a/)[0].constructor, RegExp, "Pass makeArray a regex" );
+});