Changeset 2818

Timestamp:

08/21/07 05:43:44 (1 year ago)

Author:

jeresig

Message:

Fix for a selector speed regression (calling a simple selector many times resulted in a significant speed down). This has been fixed by breaking the RegExps? out into the global scope. This required that a closure be implemented around the full jQuery script (which is now the case). Some simple changes were made in addition to the RegExp? one, allowing for some greater flexibility on our part - and hopefully better compression.

Speed results:
http://dev.jquery.com/~john/ticket/1351/ vs.
http://dev.jquery.com/~john/ticket/1351/113.html vs.
http://dev.jquery.com/~john/ticket/1351/112.html

Location:

trunk/jquery/src

Files:

• event/event.js (modified) (2 diffs)
• intro.js (modified) (1 diff)
• jquery/jquery.js (modified) (6 diffs)
• outro.js (modified) (1 diff)
• selector/selector.js (modified) (5 diffs)

trunk/jquery/src/event/event.js

@@ -579 +579 @@
 });
 
-new function(){
-
     /**
      * Bind a function to the scroll event of each matched element.
@@ -977 +975 @@
     // A fallback to window.onload, that will always work
     jQuery.event.add( window, "load", jQuery.ready );
-    
-};

trunk/jquery/src/intro.js

@@ -1 +1 @@
 // prevent execution of jQuery if included more than once
-if(typeof window.jQuery == "undefined") {
+if(typeof window.jQuery == "undefined") (function(){

trunk/jquery/src/jquery/jquery.js

@@ -9 +9 @@
  * $Rev$
  */
-
-// Global undefined variable
-window.undefined = window.undefined;
 
 /**
@@ -23 +20 @@
  * @cat Core
  */
-var jQuery = function(a,c) {
+window.jQuery = function(a,c) {
     // If the context is global, return a new object
     if ( window == this || !this.init )
@@ -36 +33 @@
     
 // Map the jQuery namespace to the '$' one
-var $ = jQuery;
+window.$ = jQuery;
 
 /**
@@ -1528 +1525 @@
         
         if (prop.match(/float/i))
-            prop = jQuery.styleFloat;
+            prop = styleFloat;
 
         if (!force && elem.style[prop])
@@ -1941 +1938 @@
  * @cat JavaScript
  */
-new function() {
-    var b = navigator.userAgent.toLowerCase();
-
-    // Figure out what browser is being used
-    jQuery.browser = {
-        version: (b.match(/.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/) || [])[1],
-        safari: /webkit/.test(b),
-        opera: /opera/.test(b),
-        msie: /msie/.test(b) && !/opera/.test(b),
-        mozilla: /mozilla/.test(b) && !/(compatible|webkit)/.test(b)
-    };
-
+var userAgent = navigator.userAgent.toLowerCase();
+
+// Figure out what browser is being used
+jQuery.browser = {
+    version: (userAgent.match(/.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/) || [])[1],
+    safari: /webkit/.test(userAgent),
+    opera: /opera/.test(userAgent),
+    msie: /msie/.test(userAgent) && !/opera/.test(userAgent),
+    mozilla: /mozilla/.test(userAgent) && !/(compatible|webkit)/.test(userAgent)
+};
+
+var styleFloat = jQuery.browser.msie ? "styleFloat" : "cssFloat";
+    
+jQuery.extend({
     // Check to see if the W3C box model is being used
-    jQuery.boxModel = !jQuery.browser.msie || document.compatMode == "CSS1Compat";
-
-    jQuery.styleFloat = jQuery.browser.msie ? "styleFloat" : "cssFloat";
-
-    jQuery.props = {
+    boxModel: !jQuery.browser.msie || document.compatMode == "CSS1Compat",
+    
+    styleFloat: jQuery.browser.msie ? "styleFloat" : "cssFloat",
+    
+    props: {
         "for": "htmlFor",
         "class": "className",
-        "float": jQuery.styleFloat,
-        cssFloat: jQuery.styleFloat,
-        styleFloat: jQuery.styleFloat,
+        "float": styleFloat,
+        cssFloat: styleFloat,
+        styleFloat: styleFloat,
         innerHTML: "innerHTML",
         className: "className",
@@ -1972 +1971 @@
         selected: "selected",
         maxlength: "maxLength"
-    };
-
-};
+    }
+});
 
 /**

trunk/jquery/src/outro.js

@@ -1 @@
-}
+})();

trunk/jquery/src/selector/selector.js

@@ +1 @@
+
+var chars = jQuery.browser.safari && parseInt(jQuery.browser.version) < 417 ?
+        "(?:[\\w*_-]|\\\\.)" :
+        "(?:[\\w\u0128-\uFFFF*_-]|\\\\.)",
+    quickChild = new RegExp("^[/>]\\s*(" + chars + "+)"),
+    quickID = new RegExp("^(" + chars + "+)(#)(" + chars + "+)"),
+    quickClass = new RegExp("^([#.]?)(" + chars + "*)");
+
 jQuery.extend({
     expr: {
@@ -63 +71 @@
 
         // Match: :even, :last-chlid, #id, .class
-        new RegExp("^([:.#]*)(" + 
-            ( jQuery.chars = jQuery.browser.safari && parseInt(jQuery.browser.version) < 417 ? "(?:[\\w*_-]|\\\\.)" : "(?:[\\w\u0128-\uFFFF*_-]|\\\\.)" ) + "+)")
+        new RegExp("^([:.#]*)(" + chars + "+)")
     ],
 
@@ -126 +133 @@
             // An attempt at speeding up child selectors that
             // point to a specific element tag
-            var re = new RegExp("^[/>]\\s*(" + jQuery.chars + "+)");
+            var re = quickChild;
             var m = re.exec(t);
 
@@ -195 +202 @@
                 } else {
                     // Optimize for the case nodeName#idName
-                    var re2 = new RegExp("^(" + jQuery.chars + "+)(#)(" + jQuery.chars + "+)");
+                    var re2 = quickID;
                     var m = re2.exec(t);
                     
@@ -205 +212 @@
                         // Otherwise, do a traditional filter check for
                         // ID, class, and element selectors
-                        re2 = new RegExp("^([#.]?)(" + jQuery.chars + "*)");
+                        re2 = quickClass;
                         m = re2.exec(t);
                     }