Added a number of additional speed gains (we now hold our own against Dojo and DOMQue...

[jquery.git] / src / jquery / jquery.js

diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js
index 489522f..ddb08a4 100644 (file)
--- a/src/jquery/jquery.js
+++ b/src/jquery/jquery.js
@@ -817,9 +817,9 @@ jQuery.fn = jQuery.prototype = {
         * @cat DOM/Traversing
         */
        find: function(t) {
-               return this.pushStack( jQuery.map( this, function(a){
+               return this.pushStack( jQuery.unique( jQuery.map( this, function(a){
                        return jQuery.find(t,a);
-               }), t );
+               }) ), t );
        },
 
        /**
@@ -1345,10 +1345,7 @@ jQuery.extend({
 
                // internal only, use is(".class")
                has: function( t, c ) {
-                       t = t.className || t;
-                       // escape regex characters
-                       c = c.replace(/([\.\\\+\*\?\[\^\]\$\(\)\{\}\=\!\<\>\|\:])/g, "\\$1");
-                       return t && new RegExp("(^|\\s)" + c + "(\\s|$)").test( t );
+                       return jQuery.inArray( c, (t.className || t).toString().split(/\s+/) ) > -1;
                }
        },
 
@@ -1629,19 +1626,27 @@ jQuery.extend({
         * @cat JavaScript
         */
        merge: function(first, second) {
-               var r = [].slice.call( first, 0 );
+               // We have to loop this way because IE & Opera overwrite the length
+               // expando of getElementsByTagName
+               for ( var i = 0; second[i]; i++ )
+                       first.push(second[i]);
+               return first;
+       },
 
-               // Now check for duplicates between the two arrays
-               // and only add the unique items
-               for ( var i = 0, sl = second.length; i < sl; i++ )
-                       // Check for duplicates
-                       if ( jQuery.inArray( second[i], r ) == -1 )
-                               // The item is unique, add it
-                               first.push( second[i] );
+       unique: function(first) {
+               var r = [], num = jQuery.mergeNum++;
 
-               return first;
+               for ( var i = 0, fl = first.length; i < fl; i++ )
+                       if ( first[i].mergeNum != num ) {
+                               first[i].mergeNum = num;
+                               r.push(first[i]);
+                       }
+
+               return r;
        },
 
+       mergeNum: 0,
+
        /**
         * Filter items out of an array, by using a filter function.
         *
@@ -1735,17 +1740,7 @@ jQuery.extend({
                        }
                }
 
-               var r = result.length ? [ result[0] ] : [];
-
-               check: for ( var i = 1, rl = result.length; i < rl; i++ ) {
-                       for ( var j = 0; j < i; j++ )
-                               if ( result[i] == r[j] )
-                                       continue check;
-
-                       r.push( result[i] );
-               }
-
-               return r;
+               return result;
        }
 });