Added selector path logging (creates a trail that plugins can use).
[jquery.git] / src / core.js
index fd19d75..94122a1 100644 (file)
@@ -38,10 +38,11 @@ jQuery.fn = jQuery.prototype = {
                if ( selector.nodeType ) {
                        this[0] = selector;
                        this.length = 1;
+                       this.context = selector;
                        return this;
                }
                // Handle HTML strings
-               if ( typeof selector == "string" ) {
+               if ( typeof selector === "string" ) {
                        // Are we dealing with HTML string or an ID?
                        var match = quickExpr.exec( selector );
 
@@ -64,7 +65,10 @@ jQuery.fn = jQuery.prototype = {
                                                        return jQuery().find( selector );
 
                                                // Otherwise, we inject the element directly into the jQuery object
-                                               return jQuery( elem );
+                                               var ret = jQuery( elem );
+                                               ret.context = document;
+                                               ret.selector = selector;
+                                               return ret;
                                        }
                                        selector = [];
                                }
@@ -82,6 +86,9 @@ jQuery.fn = jQuery.prototype = {
                return this.setArray(jQuery.makeArray(selector));
        },
 
+       // Start with an empty selector
+       selector: "",
+
        // The current version of jQuery being used
        jquery: "@VERSION",
 
@@ -90,13 +97,10 @@ jQuery.fn = jQuery.prototype = {
                return this.length;
        },
 
-       // The number of elements contained in the matched element set
-       length: 0,
-
        // Get the Nth element in the matched element set OR
        // Get the whole matched element set as a clean array
        get: function( num ) {
-               return num == undefined ?
+               return num === undefined ?
 
                        // Return a 'clean' array
                        jQuery.makeArray( this ) :
@@ -107,13 +111,20 @@ jQuery.fn = jQuery.prototype = {
 
        // Take an array of elements and push it onto the stack
        // (returning the new matched element set)
-       pushStack: function( elems ) {
+       pushStack: function( elems, name, selector ) {
                // Build a new jQuery matched element set
                var ret = jQuery( elems );
 
                // Add the old object onto the stack (as a reference)
                ret.prevObject = this;
 
+               ret.context = this.context;
+
+               if ( name === "find" )
+                       ret.selector = this.selector + (this.selector ? " " : "") + selector;
+               else if ( name )
+                       ret.selector = this.selector + "." + name + "(" + selector + ")";
+
                // Return the newly-formed element set
                return ret;
        },
@@ -153,7 +164,7 @@ jQuery.fn = jQuery.prototype = {
                var options = name;
 
                // Look for the case where we're accessing a style value
-               if ( name.constructor == String )
+               if ( typeof name === "string" )
                        if ( value === undefined )
                                return this[0] && jQuery[ type || "attr" ]( this[0], name );
 
@@ -183,7 +194,7 @@ jQuery.fn = jQuery.prototype = {
        },
 
        text: function( text ) {
-               if ( typeof text != "object" && text != null )
+               if ( typeof text !== "object" && text != null )
                        return this.empty().append( (this[0] && this[0].ownerDocument || document).createTextNode( text ) );
 
                var ret = "";
@@ -268,7 +279,7 @@ jQuery.fn = jQuery.prototype = {
 
                return this.pushStack( /[^+>] [^+>]/.test( selector ) ?
                        jQuery.unique( elems ) :
-                       elems );
+                       elems, "find", selector );
        },
 
        clone: function( events ) {
@@ -295,7 +306,7 @@ jQuery.fn = jQuery.prototype = {
                // removeData doesn't work here, IE removes it from the original as well
                // this is primarily for IE but the data expando shouldn't be copied over in any browser
                var clone = ret.find("*").andSelf().each(function(){
-                       if ( this[ expando ] != undefined )
+                       if ( this[ expando ] !== undefined )
                                this[ expando ] = null;
                });
 
@@ -322,14 +333,14 @@ jQuery.fn = jQuery.prototype = {
                                return selector.call( elem, i );
                        }) ||
 
-                       jQuery.multiFilter( selector, this ) );
+                       jQuery.multiFilter( selector, this ), "filter", selector );
        },
 
        not: function( selector ) {
-               if ( selector.constructor == String )
+               if ( typeof selector === "string" )
                        // test special case where just one selector is passed in
                        if ( isSimple.test( selector ) )
-                               return this.pushStack( jQuery.multiFilter( selector, this, true ) );
+                               return this.pushStack( jQuery.multiFilter( selector, this, true ), "not", selector );
                        else
                                selector = jQuery.multiFilter( selector, this );
 
@@ -342,7 +353,7 @@ jQuery.fn = jQuery.prototype = {
        add: function( selector ) {
                return this.pushStack( jQuery.unique( jQuery.merge(
                        this.get(),
-                       typeof selector == 'string' ?
+                       typeof selector === "string" ?
                                jQuery( selector ) :
                                jQuery.makeArray( selector )
                )));
@@ -353,15 +364,17 @@ jQuery.fn = jQuery.prototype = {
        },
 
        hasClass: function( selector ) {
-               return this.is( "." + selector );
+               return !!selector && this.is( "." + selector );
        },
 
        val: function( value ) {
-               if ( value == undefined ) {
-
-                       if ( this.length ) {
-                               var elem = this[0];
+               if ( value === undefined ) {                    
+                       var elem = this[0];
 
+                       if ( elem ) {
+                               if( jQuery.nodeName( elem, 'option' ) )
+                                       return (elem.attributes.value || {}).specified ? elem.value : elem.text;
+                               
                                // We need to handle select boxes special
                                if ( jQuery.nodeName( elem, "select" ) ) {
                                        var index = elem.selectedIndex,
@@ -379,7 +392,7 @@ jQuery.fn = jQuery.prototype = {
 
                                                if ( option.selected ) {
                                                        // Get the specifc value for the option
-                                                       value = jQuery.browser.msie && !option.attributes.value.specified ? option.text : option.value;
+                                                       value = jQuery(option).val();
 
                                                        // We don't need an array for one selects
                                                        if ( one )
@@ -390,25 +403,25 @@ jQuery.fn = jQuery.prototype = {
                                                }
                                        }
 
-                                       return values;
+                                       return values;                          
+                               }
 
                                // Everything else, we just grab the value
-                               } else
-                                       return (this[0].value || "").replace(/\r/g, "");
+                               return (elem.value || "").replace(/\r/g, "");
 
                        }
 
                        return undefined;
                }
 
-               if( value.constructor == Number )
+               if ( typeof value === "number" )
                        value += '';
 
                return this.each(function(){
                        if ( this.nodeType != 1 )
                                return;
 
-                       if ( value.constructor == Array && /radio|checkbox/.test( this.type ) )
+                       if ( jQuery.isArray(value) && /radio|checkbox/.test( this.type ) )
                                this.checked = (jQuery.inArray(this.value, value) >= 0 ||
                                        jQuery.inArray(this.name, value) >= 0);
 
@@ -429,7 +442,7 @@ jQuery.fn = jQuery.prototype = {
        },
 
        html: function( value ) {
-               return value == undefined ?
+               return value === undefined ?
                        (this[0] ?
                                this[0].innerHTML :
                                null) :
@@ -445,7 +458,8 @@ jQuery.fn = jQuery.prototype = {
        },
 
        slice: function() {
-               return this.pushStack( Array.prototype.slice.apply( this, arguments ) );
+               return this.pushStack( Array.prototype.slice.apply( this, arguments ),
+                       "slice", Array.prototype.slice.call(arguments).join(",") );
        },
 
        map: function( callback ) {
@@ -551,7 +565,7 @@ jQuery.extend = jQuery.fn.extend = function() {
        var target = arguments[0] || {}, i = 1, length = arguments.length, deep = false, options;
 
        // Handle a deep copy situation
-       if ( target.constructor == Boolean ) {
+       if ( typeof target === "boolean" ) {
                deep = target;
                target = arguments[1] || {};
                // skip the boolean and the target
@@ -559,7 +573,7 @@ jQuery.extend = jQuery.fn.extend = function() {
        }
 
        // Handle case when target is a string or something (possible in deep copy)
-       if ( typeof target != "object" && typeof target != "function" )
+       if ( typeof target !== "object" && !jQuery.isFunction(target) )
                target = {};
 
        // extend jQuery itself if only one argument is passed
@@ -580,7 +594,7 @@ jQuery.extend = jQuery.fn.extend = function() {
                                        continue;
 
                                // Recurse if we're merging object values
-                               if ( deep && copy && typeof copy == "object" && !copy.nodeType )
+                               if ( deep && copy && typeof copy === "object" && !copy.nodeType )
                                        target[ name ] = jQuery.extend( deep, 
                                                // Never move original objects, clone them
                                                src || ( copy.length != null ? [ ] : { } )
@@ -600,7 +614,8 @@ var expando = "jQuery" + now(), uuid = 0, windowData = {},
        // exclude the following css properties to add px
        exclude = /z-?index|font-?weight|opacity|zoom|line-?height/i,
        // cache defaultView
-       defaultView = document.defaultView || {};
+       defaultView = document.defaultView || {},
+       toString = Object.prototype.toString;
 
 jQuery.extend({
        noConflict: function( deep ) {
@@ -612,10 +627,15 @@ jQuery.extend({
                return jQuery;
        },
 
-       // See test/unit/core.js for details concerning this function.
-       isFunction: function( fn ) {
-               return !!fn && typeof fn != "string" && !fn.nodeName &&
-                       fn.constructor != Array && /^[\s[]?function/.test( fn + "" );
+       // See test/unit/core.js for details concerning isFunction.
+       // Since version 1.3, DOM methods and functions like alert
+       // aren't supported. They return false on IE (#2968).
+       isFunction: function( obj ) {
+               return toString.call(obj) === "[object Function]";
+       },
+
+       isArray: function( obj ) {
+               return toString.call(obj) === "[object Array]";
        },
 
        // check if an element is in a (or is an) XML document
@@ -675,7 +695,7 @@ jQuery.extend({
 
                // Return the named cache data, or the ID for the element
                return name ?
-                       jQuery.cache[ id ][ name ] :
+                       jQuery.cache[ id ][ name ] || null :
                        id;
        },
 
@@ -724,7 +744,7 @@ jQuery.extend({
                var name, i = 0, length = object.length;
 
                if ( args ) {
-                       if ( length == undefined ) {
+                       if ( length === undefined ) {
                                for ( name in object )
                                        if ( callback.apply( object[ name ], args ) === false )
                                                break;
@@ -735,7 +755,7 @@ jQuery.extend({
 
                // A special, fast, case for the most common use of each
                } else {
-                       if ( length == undefined ) {
+                       if ( length === undefined ) {
                                for ( name in object )
                                        if ( callback.call( object[ name ], name, object[ name ] ) === false )
                                                break;
@@ -753,7 +773,7 @@ jQuery.extend({
                        value = value.call( elem, i );
 
                // Handle passing in a number to a CSS property
-               return value && value.constructor == Number && type == "curCSS" && !exclude.test( name ) ?
+               return typeof value === "number" && type == "curCSS" && !exclude.test( name ) ?
                        value + "px" :
                        value;
        },
@@ -770,7 +790,7 @@ jQuery.extend({
                // internal only, use removeClass("class")
                remove: function( elem, classNames ) {
                        if (elem.nodeType == 1)
-                               elem.className = classNames != undefined ?
+                               elem.className = classNames !== undefined ?
                                        jQuery.grep(elem.className.split(/\s+/), function(className){
                                                return !jQuery.className.has( classNames, className );
                                        }).join(" ") :
@@ -938,19 +958,20 @@ jQuery.extend({
        clean: function( elems, context ) {
                var ret = [];
                context = context || document;
+
                // !context.createElement fails in IE with an error but returns typeof 'object'
-               if (typeof context.createElement == 'undefined')
+               if ( typeof context.createElement === "undefined" )
                        context = context.ownerDocument || context[0] && context[0].ownerDocument || document;
 
                jQuery.each(elems, function(i, elem){
-                       if ( typeof elem == 'number' )
+                       if ( typeof elem === "number" )
                                elem += '';
 
                        if ( !elem )
                                return;
 
                        // Convert html string into DOM nodes
-                       if ( typeof elem == "string" ) {
+                       if ( typeof elem === "string" ) {
                                // Fix "XHTML"-style tags in all browsers
                                elem = elem.replace(/(<(\w+)[^>]*?)\/>/g, function(all, front, tag){
                                        return tag.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i) ?
@@ -1023,7 +1044,7 @@ jQuery.extend({
                        if ( elem.length === 0 && (!jQuery.nodeName( elem, "form" ) && !jQuery.nodeName( elem, "select" )) )
                                return;
 
-                       if ( elem[0] == undefined || jQuery.nodeName( elem, "form" ) || elem.options )
+                       if ( elem[0] === undefined || jQuery.nodeName( elem, "form" ) || elem.options )
                                ret.push( elem );
 
                        else
@@ -1130,8 +1151,8 @@ jQuery.extend({
 
                if( array != null ){
                        var i = array.length;
-                       //the window, strings and functions also have 'length'
-                       if( i == null || array.split || array.setInterval || array.call )
+                       // The window, strings (and functions) also have 'length'
+                       if( i == null || typeof array === "string" || jQuery.isFunction(array) || array.setInterval )
                                ret[0] = array;
                        else
                                while( i )
@@ -1157,12 +1178,12 @@ jQuery.extend({
                // Also, we need to make sure that the correct elements are being returned
                // (IE returns comment nodes in a '*' query)
                if ( jQuery.browser.msie ) {
-                       while ( elem = second[ i++ ] )
+                       while ( (elem = second[ i++ ]) )
                                if ( elem.nodeType != 8 )
                                        first[ pos++ ] = elem;
 
                } else
-                       while ( elem = second[ i++ ] )
+                       while ( (elem = second[ i++ ]) )
                                first[ pos++ ] = elem;
 
                return first;
@@ -1221,7 +1242,7 @@ var userAgent = navigator.userAgent.toLowerCase();
 
 // Figure out what browser is being used
 jQuery.browser = {
-       version: (userAgent.match( /.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/ ) || [])[1],
+       version: (userAgent.match( /.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/ ) || [0,'0'])[1],
        safari: /webkit/.test( userAgent ),
        opera: /opera/.test( userAgent ),
        msie: /msie/.test( userAgent ) && !/opera/.test( userAgent ),
@@ -1266,7 +1287,7 @@ jQuery.each({
                if ( selector && typeof selector == "string" )
                        ret = jQuery.multiFilter( selector, ret );
 
-               return this.pushStack( jQuery.unique( ret ) );
+               return this.pushStack( jQuery.unique( ret ), name, selector );
        };
 });
 
@@ -1339,7 +1360,7 @@ jQuery.each([ "Height", "Width" ], function(i, name){
                // Get window width or height
                return this[0] == window ?
                        // Opera reports document.body.client[Width/Height] properly in both quirks and standards
-                       jQuery.browser.opera && document.body[ "client" + name ] ||
+                       jQuery.browser.opera && document.body.parentNode[ "client" + name ] ||
 
                        // Safari reports inner[Width/Height] just fine (Mozilla and Opera include scroll bar widths)
                        jQuery.browser.safari && window[ "inner" + name ] ||
@@ -1356,12 +1377,12 @@ jQuery.each([ "Height", "Width" ], function(i, name){
                                ) :
 
                                // Get or set width or height on the element
-                               size == undefined ?
+                               size === undefined ?
                                        // Get width or height on the element
                                        (this.length ? jQuery.css( this[0], type ) : null) :
 
                                        // Set the width or height on the element (default to pixels if value is unitless)
-                                       this.css( type, size.constructor == String ? size : size + "px" );
+                                       this.css( type, typeof size === "string" ? size : size + "px" );
        };
 });