Fixed a handful of places where $() was used explicitly, rather than jQuery().

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

diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js
index d40335b..ad65585 100644 (file)
--- a/src/jquery/jquery.js
+++ b/src/jquery/jquery.js
@@ -38,11 +38,11 @@ function jQuery(a,c) {
 
        // Watch for when a jQuery object is passed as the selector
        if ( a.jquery )
-               return $( jQuery.merge( a, [] ) );
+               return jQuery( jQuery.merge( a, [] ) );
 
        // Watch for when a jQuery object is passed at the context
        if ( c && c.jquery )
-               return $( c ).find(a);
+               return jQuery( c ).find(a);
        
        // If the context is global, return a new object
        if ( window == this )
@@ -378,8 +378,9 @@ jQuery.fn = jQuery.prototype = {
                for ( var j = 0; j < e.length; j++ ) {
                        var r = e[j].childNodes;
                        for ( var i = 0; i < r.length; i++ )
-                               t += r[i].nodeType != 1 ?
-                                       r[i].nodeValue : jQuery.fn.text([ r[i] ]);
+                               if ( r[i].nodeType != 8 )
+                                       t += r[i].nodeType != 1 ?
+                                               r[i].nodeValue : jQuery.fn.text([ r[i] ]);
                }
                return t;
        },
@@ -822,7 +823,7 @@ jQuery.extend({
                                var a = arguments;
                                return this.each(function(){
                                        for ( var j = 0; j < a.length; j++ )
-                                               $(a[j])[n]( this );
+                                               jQuery(a[j])[n]( this );
                                });
                        };
                });
@@ -923,7 +924,7 @@ jQuery.extend({
                                        oHeight = e.offsetHeight;
                                        oWidth = e.offsetWidth;
                                } else {
-                                       e = $(e.cloneNode(true)).css({
+                                       e = jQuery(e.cloneNode(true)).css({
                                                visibility: "hidden", position: "absolute", display: "block"
                                        }).prependTo("body")[0];
 
@@ -1109,7 +1110,7 @@ jQuery.extend({
         * @test t( "Adjacent", "p + p", ["ap","en","sap"] );
         * @test t( "Comma, Child, and Adjacent", "a + a, code > a", ["groups","anchor1","anchor2"] );
         * @test t( "First Child", "p:first-child", ["firstp","sndp"] );
-   * @test t( "Attribute Exists", "a[@title]", ["google"] );
+        * @test t( "Attribute Exists", "a[@title]", ["google"] );
         * @test t( "Attribute Exists", "*[@title]", ["google"] );
         * @test t( "Attribute Exists", "[@title]", ["google"] );
         * @test t( "Attribute Equals", "a[@rel='bookmark']", ["simon1"] );
@@ -1198,6 +1199,8 @@ jQuery.extend({
                        var foundToken = false;
                        
                        for ( var i = 0; i < jQuery.token.length; i += 2 ) {
+                               if ( foundToken ) continue;
+
                                var re = new RegExp("^(" + jQuery.token[i] + ")");
                                var m = re.exec(t);
                                
@@ -1234,8 +1237,9 @@ jQuery.extend({
                                                        );
                                        }
                                }
-                       }
        
+                       }
+
                        if ( t ) {
                                var val = jQuery.filter(t,r);
                                ret = r = val.r;
@@ -1266,7 +1270,9 @@ jQuery.extend({
                        "class": "className",
                        "float": "cssFloat",
                        innerHTML: "innerHTML",
-                       className: "className"
+                       className: "className",
+                       value: "value",
+                       disabled: "disabled"
                };
 
                if ( fix[name] ) {
@@ -2454,7 +2460,7 @@ jQuery.macros = {
                 * @cat Effects
                 */
                toggle: function(){
-                       $(this)[ $(this).is(":hidden") ? "show" : "hide" ].apply( $(this), arguments );
+                       jQuery(this)[ jQuery(this).is(":hidden") ? "show" : "hide" ].apply( jQuery(this), arguments );
                },
                
                /**
@@ -2598,7 +2604,7 @@ jQuery.macros = {
                 */
                bind: function( type, fn ) {
                        if ( fn.constructor == String )
-                               fn = new Function("e", ( !fn.indexOf(".") ? "$(this)" : "return " ) + fn);
+                               fn = new Function("e", ( !fn.indexOf(".") ? "jQuery(this)" : "return " ) + fn);
                        jQuery.event.add( this, type, fn );
                },