Added in jQuery.isFunction().

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

diff --git a/src/selector/selector.js b/src/selector/selector.js
index e9e859e..867bc4e 100644 (file)
--- a/src/selector/selector.js
+++ b/src/selector/selector.js
@@ -172,7 +172,7 @@ jQuery.extend({
                                        // If the token match was found
                                        if ( m ) {
                                                // Map it against the token's handler
-                                               r = ret = jQuery.map( ret, jQuery.token[i+1].constructor == Function ?
+                                               r = ret = jQuery.map( ret, jQuery.isFunction( jQuery.token[i+1] ) ?
                                                        jQuery.token[i+1] :
                                                        function(a){ return eval(jQuery.token[i+1]); });
 
@@ -312,13 +312,13 @@ jQuery.extend({
                                var m = re.exec( t );
 
                                if ( m ) {
+                                       // Remove what we just matched
+                                       t = t.substring( m[0].length );
+
                                        // Re-organize the first match
                                        if ( jQuery.expr[ m[1] ]._resort )
                                                m = jQuery.expr[ m[1] ]._resort( m );
 
-                                       // Remove what we just matched
-                                       t = t.replace( re, "" );
-
                                        break;
                                }
                        }