Changeset 1596

Timestamp:

03/26/07 02:06:50 (2 years ago)

Author:

john

Message:

Added a number of additional speed gains (we now hold our own against Dojo and DOMQuery), touched up some of the selector code, fixed some minor bugs, fixed a bug with triggerEvent in Opera, fixed some more test case bugs.

Location:

trunk/jquery

Files:

• build/test/data/testrunner.js (modified) (1 diff)
• src/jquery/coreTest.js (modified) (2 diffs)
• src/jquery/jquery.js (modified) (1 diff)
• src/selector/selector.js (modified) (8 diffs)

trunk/jquery/build/test/data/testrunner.js

@@ -265 +265 @@
  */
 function triggerEvent( elem, type, event ) {
-    if ( jQuery.browser.mozilla ) {
+    if ( jQuery.browser.mozilla || jQuery.browser.opera ) {
         event = document.createEvent("MouseEvents");
         event.initMouseEvent(type, true, true, elem.ownerDocument.defaultView,
             0, 0, 0, 0, 0, false, false, false, false, 0, null);
         elem.dispatchEvent( event );
-    } else if ( jQuery.browser.msie || jQuery.browser.opera ) {
-        event = document.createEventObject();
-        elem.fireEvent("on"+type, event);
-    }
-}
+    } else if ( jQuery.browser.msie ) {
+        elem.fireEvent("on"+type);
+    }
+}

trunk/jquery/src/jquery/coreTest.js

@@ -345 +345 @@
     $('#check1').click(function() {     
         var checkbox = this;        
-        ok( !checkbox.checked, "Checkbox's state is erased after wrap() action, see #769" );
+        ok( checkbox.checked, "Checkbox's state is erased after wrap() action, see #769" );
         $(checkbox).wrap( '<div id="c1" style="display:none;"></div>' );
-        ok( !checkbox.checked, "Checkbox's state is erased after wrap() action, see #769" );
+        ok( checkbox.checked, "Checkbox's state is erased after wrap() action, see #769" );
         // use a fade in to check state after this event handler has finished
-        $("#c1").fadeIn(function() {
-            ok( checkbox.checked, "Checkbox's state is erased after wrap() action, see #769" );
+        setTimeout(function() {
+            ok( !checkbox.checked, "Checkbox's state is erased after wrap() action, see #769" );
             start();
-        });
+        }, 100);
     }).click();
 });
@@ -693 +693 @@
     isSet( $("#sndp").siblings("[code]").get(), q("sap"), "Check for filtered siblings (has code child element)" ); 
     isSet( $("#sndp").siblings("[a]").get(), q("en", "sap"), "Check for filtered siblings (has anchor child element)" );
-    isSet( $("#foo").siblings("form, b").get(), q("form", "floatTest"), "Check for multiple filters" );
+    isSet( $("#foo").siblings("form, b").get(), q("form", "lengthtest", "floatTest"), "Check for multiple filters" );
 });
 

trunk/jquery/src/jquery/jquery.js

@@ -1631 +1631 @@
         for ( var i = 0; second[i]; i++ )
             first.push(second[i]);
-
         return first;
     },

trunk/jquery/src/selector/selector.js

@@ -155 +155 @@
             if ( m ) {
                 // Perform our own iteration and filter
-                jQuery.each( ret, function(){
-                    for ( var c = this.firstChild; c; c = c.nextSibling )
-                        if ( c.nodeType == 1 && ( jQuery.nodeName(c, m[1]) || m[1] == "*" ) )
+                for ( var i = 0; ret[i]; i++ )
+                    for ( var c = ret[i].firstChild; c; c = c.nextSibling )
+                        if ( c.nodeType == 1 && ( m[1] == "*" || jQuery.nodeName(c, m[1]) ) )
                             r.push( c );
-                });
 
                 ret = r;
@@ -167 +166 @@
             } else {
                 // Look for pre-defined expression tokens
-                for ( var i = 0; i < jQuery.token.length; i += 2 ) {
+                for ( var i = 0, tl = jQuery.token.length; i < tl; i += 2 ) {
                     // Attempt to match each, individual, token in
                     // the specified order
@@ -237 +236 @@
                         // that div#foo searches will be really fast
                         ret = r = oid && (!m[3] || jQuery.nodeName(oid, m[3])) ? [oid] : [];
-
                     } else {
                         // We need to find all descendant elements
-                        for ( var i = 0, rl = ret.length; i < rl; i++ ) {
+                        for ( var i = 0; ret[i]; i++ ) {
                             // Grab the tag name being searched for
                             var tag = m[1] != "" || m[0] == "" ? "*" : m[2];
@@ -253 +251 @@
                         // It's faster to filter by class and be done with it
                         if ( m[1] == "." )
-                            r = jQuery.grep( r, function(e) {
-                                return jQuery.className.has(e, m[2]);
-                            });
+                            r = jQuery.classFilter( r, m[2] );
 
                         // Same with ID filtering
                         if ( m[1] == "#" ) {
-                            // Remember, then wipe out, the result set
-                            var tmp = r;
-                            r = [];
-
-                            // Then try to find the element with the ID
-                            jQuery.each( tmp, function(){
-                                if ( this.getAttribute("id") == m[2] ) {
-                                    r = [ this ];
-                                    return false;
+                            var tmp = [];
+
+                            // Try to find the element with the ID
+                            for ( var i = 0; r[i]; i++ )
+                                if ( r[i].getAttribute("id") == m[2] ) {
+                                    tmp = [ r[i] ];
+                                    break;
                                 }
-                            });
+
+                            r = tmp;
                         }
 
@@ -304 +299 @@
     },
 
+    classFilter: function(r,m,not){
+        m = " " + m + " ";
+        var tmp = [];
+        for ( var i = 0; r[i]; i++ ) {
+            var pass = (" " + r[i].className + " ").indexOf( m ) >= 0;
+            if ( !not && pass || not && !pass )
+                tmp.push( r[i] );
+        }
+        return tmp;
+    },
+
     filter: function(t,r,not) {
         var last;
@@ -313 +319 @@
             var p = jQuery.parse, m;
 
-            jQuery.each( p, function(i,re){
-        
-                // Look for, and replace, string-like sequences
-                // and finally build a regexp out of it
-                m = re.exec( t );
+            for ( var i = 0; p[i]; i++ ) {
+                m = p[i].exec( t );
 
                 if ( m ) {
@@ -329 +332 @@
                     m[2] = m[2].replace(/\\/g, "");
 
-                    return false;
+                    break;
                 }
-            });
+            }
 
             if ( !m )
-                continue;
+                break;
 
             // :not() is a special case that can be optimized by
@@ -340 +343 @@
             if ( m[1] == ":" && m[2] == "not" )
                 r = jQuery.filter(m[3], r, true).r;
+
+            // We can get a big speed boost by filtering by class here
+            else if ( m[1] == "." )
+                r = jQuery.classFilter(r, m[2], not);
 
             // Otherwise, find the expression to execute