Added fix for bug #1567 - uppercase nodeName test in .add().
[jquery.git] / src / core.js
index ab6b619..1236f1c 100644 (file)
 if ( typeof jQuery != "undefined" )
        var _jQuery = jQuery;
 
-var jQuery = window.jQuery = function(a,c) {
-       // If the context is global, return a new object
-       if ( window == this || !this.init )
-               return new jQuery(a,c);
-       
-       return this.init(a,c);
+var jQuery = window.jQuery = function(selector, context) {
+       // If the context is a namespace object, return a new object
+       return this instanceof jQuery ?
+               this.init(selector, context) :
+               new jQuery(selector, context);
 };
 
 // Map over the $ in case of overwrite
@@ -31,17 +30,17 @@ window.$ = jQuery;
 var quickExpr = /^[^<]*(<(.|\s)+>)[^>]*$|^#(\w+)$/;
 
 jQuery.fn = jQuery.prototype = {
-       init: function(a,c) {
+       init: function(selector, context) {
                // Make sure that a selection was provided
-               a = a || document;
+               selector = selector || document;
 
                // Handle HTML strings
-               if ( typeof a  == "string" ) {
-                       var m = quickExpr.exec(a);
-                       if ( m && (m[1] || !c) ) {
+               if ( typeof selector  == "string" ) {
+                       var m = quickExpr.exec(selector);
+                       if ( m && (m[1] || !context) ) {
                                // HANDLE: $(html) -> $(array)
                                if ( m[1] )
-                                       a = jQuery.clean( [ m[1] ], c );
+                                       selector = jQuery.clean( [ m[1] ], context );
 
                                // HANDLE: $("#id")
                                else {
@@ -50,35 +49,35 @@ jQuery.fn = jQuery.prototype = {
                                                // Handle the case where IE and Opera return items
                                                // by name instead of ID
                                                if ( tmp.id != m[3] )
-                                                       return jQuery().find( a );
+                                                       return jQuery().find( selector );
                                                else {
                                                        this[0] = tmp;
                                                        this.length = 1;
                                                        return this;
                                                }
                                        else
-                                               a = [];
+                                               selector = [];
                                }
 
                        // HANDLE: $(expr)
                        } else
-                               return new jQuery( c ).find( a );
+                               return new jQuery( context ).find( selector );
 
                // HANDLE: $(function)
                // Shortcut for document ready
-               } else if ( jQuery.isFunction(a) )
-                       return new jQuery(document)[ jQuery.fn.ready ? "ready" : "load" ]( a );
+               } else if ( jQuery.isFunction(selector) )
+                       return new jQuery(document)[ jQuery.fn.ready ? "ready" : "load" ]( selector );
 
                return this.setArray(
                        // HANDLE: $(array)
-                       a.constructor == Array && a ||
+                       selector.constructor == Array && selector ||
 
                        // HANDLE: $(arraylike)
                        // Watch for when an array-like object is passed as the selector
-                       (a.jquery || a.length && a != window && !a.nodeType && a[0] != undefined && a[0].nodeType) && jQuery.makeArray( a ) ||
+                       (selector.jquery || selector.length && selector != window && !selector.nodeType && selector[0] != undefined && selector[0].nodeType) && jQuery.makeArray( selector ) ||
 
                        // HANDLE: $(*)
-                       [ a ] );
+                       [ selector ] );
        },
        
        jquery: "@VERSION",
@@ -228,44 +227,31 @@ jQuery.fn = jQuery.prototype = {
                        jQuery.unique( data ) : data );
        },
 
-       clone: function() {
-               var $this = this.add(this.find("*"));
-               if (jQuery.browser.msie) {
-                       // Need to remove events on the element and its descendants
-                       $this.each(function() {
-                               this._$events = {};
-                               for (var type in this.$events)
-                                       this._$events[type] = jQuery.extend({},this.$events[type]);
-                       }).unbind();
-               }
-
+       clone: function(events) {
                // Do the clone
-               var r = this.pushStack( jQuery.map( this, function(a){
-                       return a.cloneNode( true );
-               }) );
-
-               if (jQuery.browser.msie) {
-                       $this.each(function() {
-                               // Add the events back to the original and its descendants
-                               var events = this._$events;
-                               for (var type in events)
-                                       for (var handler in events[type])
-                                               jQuery.event.add(this, type, events[type][handler], events[type][handler].data);
-                               this._$events = null;
-                       });
-               }
+               var ret = this.map(function(){
+                       return this.outerHTML ? jQuery(this.outerHTML)[0] : this.cloneNode(true);
+               });
 
-               // copy form values over
-               var inputs = r.add(r.find('*')).filter('select,input[@type=checkbox]');
-               $this.filter('select,input[@type=checkbox]').each(function(i) {
-                       if (this.selectedIndex)
-                               inputs[i].selectedIndex = this.selectedIndex;
-                       if (this.checked)
-                               inputs[i].checked = true;
+               // Need to set the expando to null on the cloned set if it exists
+               // 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 )
+                               this[ expando ] = null;
                });
+               
+               // Copy the events from the original to the clone
+               if (events === true)
+                       this.find("*").andSelf().each(function(i) {
+                               var events = jQuery.data(this, "events");
+                               for ( var type in events )
+                                       for ( var handler in events[type] )
+                                               jQuery.event.add(clone[i], type, events[type][handler], events[type][handler].data);
+                       });
 
                // Return the cloned set
-               return r;
+               return ret;
        },
 
        filter: function(t) {
@@ -296,7 +282,7 @@ jQuery.fn = jQuery.prototype = {
                        this.get(),
                        t.constructor == String ?
                                jQuery(t).get() :
-                               t.length != undefined && (!t.nodeName || t.nodeName == "FORM") ?
+                               t.length != undefined && (!t.nodeName || jQuery.nodeName(t, "form")) ?
                                        t : [t] )
                );
        },
@@ -311,31 +297,60 @@ jQuery.fn = jQuery.prototype = {
        
        val: function( val ) {
                if ( val == undefined ) {
-                   if ( this.length ) {
-                       var elem = this[0];
+                       if ( this.length ) {
+                               var elem = this[0];
                        
-                       // We need to handle select boxes special\r                              if ( jQuery.nodeName(elem, "select") ) {\r                                       var index = elem.selectedIndex,
+                               // We need to handle select boxes special
+                               if ( jQuery.nodeName(elem, "select") ) {
+                                       var index = elem.selectedIndex,
                                                a = [],
                                                options = elem.options,
                                                one = elem.type == "select-one";
                                        
-                                       // Nothing was selected\r                                        if ( index < 0 )
-                                               return null;\r
-
-                                       // Loop through all the selected options\r                                       for ( var i = one ? index : 0, max = one ? index + 1 : options.length; i < max; i++ ) {
-                                               var option = options[i];\r                                               if ( option.selected ) {\r                                                       // Get the specifc value for the option\r                                                        var val = jQuery.browser.msie && !option.attributes["value"].specified ? option.text : option.value;
+                                       // Nothing was selected
+                                       if ( index < 0 )
+                                               return null;
+
+                                       // Loop through all the selected options
+                                       for ( var i = one ? index : 0, max = one ? index + 1 : options.length; i < max; i++ ) {
+                                               var option = options[i];
+                                               if ( option.selected ) {
+                                                       // Get the specifc value for the option
+                                                       var val = jQuery.browser.msie && !option.attributes["value"].specified ? option.text : option.value;
                                                        
-                                                       // We don't need an array for one selects\r                                                      if ( one )
+                                                       // We don't need an array for one selects
+                                                       if ( one )
                                                                return val;
                                                        
-                                                       // Multi-Selects return an array\r                                                       a.push(val);\r                                           }\r                                      }
-                                       \r                                       return a;
+                                                       // Multi-Selects return an array
+                                                       a.push(val);
+                                               }
+                                       }
                                        
-                               // Everything else, we just grab the value\r                             } else
+                                       return a;
+                                       
+                               // Everything else, we just grab the value
+                               } else
                                        return this[0].value.replace(/\r/g, "");
                        }
                } else
-                       return this.attr( "value", val );
+                       return this.each(function(){
+                               if ( val.constructor == Array && /radio|checkbox/.test(this.type) )
+                                       this.checked = (jQuery.inArray(this.value, val) >= 0 ||
+                                               jQuery.inArray(this.name, val) >= 0);
+                               else if ( jQuery.nodeName(this, "select") ) {
+                                       var tmp = val.constructor == Array ? val : [val];
+
+                                       jQuery("option", this).each(function(){
+                                               this.selected = (jQuery.inArray(this.value, tmp) >= 0 ||
+                                               jQuery.inArray(this.text, tmp) >= 0);
+                                       });
+
+                                       if ( !tmp.length )
+                                               this.selectedIndex = -1;
+                               } else
+                                       this.value = val;
+                       });
        },
        
        html: function( val ) {
@@ -348,6 +363,10 @@ jQuery.fn = jQuery.prototype = {
                return this.after( val ).remove();
        },
 
+       eq: function(i){
+               return this.slice(i, i+1);
+       },
+
        slice: function() {
                return this.pushStack( Array.prototype.slice.apply( this, arguments ) );
        },
@@ -378,18 +397,32 @@ jQuery.fn = jQuery.prototype = {
                                obj = this.getElementsByTagName("tbody")[0] || this.appendChild(document.createElement("tbody"));
 
                        jQuery.each( a, function(){
-                               if ( jQuery.nodeName(this, "script") ) {
-                                       if ( this.src )
-                                               jQuery.ajax({ url: this.src, async: false, dataType: "script" });
-                                       else
-                                               jQuery.globalEval( this.text || this.textContent || this.innerHTML || "" );
-                               } else
-                                       fn.apply( obj, [ clone ? this.cloneNode(true) : this ] );
+                               var elem = clone ? this.cloneNode(true) : this;
+                               if ( !evalScript(0, elem) )
+                                       fn.call( obj, elem );
                        });
                });
        }
 };
 
+function evalScript(i, elem){
+       var script = jQuery.nodeName(elem, "script");
+
+       if ( script ) {
+               if ( elem.src )
+                       jQuery.ajax({ url: elem.src, async: false, dataType: "script" });
+               else
+                       jQuery.globalEval( elem.text || elem.textContent || elem.innerHTML || "" );
+       
+               if ( elem.parentNode )
+                       elem.parentNode.removeChild(elem);
+
+       } else if ( elem.nodeType == 1 )
+    jQuery("script", elem).each(evalScript);
+
+       return script;
+}
+
 jQuery.extend = jQuery.fn.extend = function() {
        // copy reference to target object
        var target = arguments[0] || {}, a = 1, al = arguments.length, deep = false;
@@ -430,6 +463,8 @@ jQuery.extend = jQuery.fn.extend = function() {
        return target;
 };
 
+var expando = "jQuery" + (new Date()).getTime(), uuid = 0, win = {};
+
 jQuery.extend({
        noConflict: function(deep) {
                window.$ = _$;
@@ -469,6 +504,65 @@ jQuery.extend({
        nodeName: function( elem, name ) {
                return elem.nodeName && elem.nodeName.toUpperCase() == name.toUpperCase();
        },
+       
+       cache: {},
+       
+       data: function( elem, name, data ) {
+               elem = elem == window ? win : elem;
+
+               var id = elem[ expando ];
+
+               // Compute a unique ID for the element
+               if ( !id ) 
+                       id = elem[ expando ] = ++uuid;
+
+               // Only generate the data cache if we're
+               // trying to access or manipulate it
+               if ( name && !jQuery.cache[ id ] )
+                       jQuery.cache[ id ] = {};
+               
+               // Prevent overriding the named cache with undefined values
+               if ( data != undefined )
+                       jQuery.cache[ id ][ name ] = data;
+               
+               // Return the named cache data, or the ID for the element       
+               return name ? jQuery.cache[ id ][ name ] : id;
+       },
+       
+       removeData: function( elem, name ) {
+               elem = elem == window ? win : elem;
+
+               var id = elem[ expando ];
+
+               // If we want to remove a specific section of the element's data
+               if ( name ) {
+                       if ( jQuery.cache[ id ] ) {
+                               // Remove the section of cache data
+                               delete jQuery.cache[ id ][ name ];
+
+                               // If we've removed all the data, remove the element's cache
+                               name = "";
+                               for ( name in jQuery.cache[ id ] ) break;
+                               if ( !name )
+                                       jQuery.removeData( elem );
+                       }
+
+               // Otherwise, we want to remove all of the element's data
+               } else {
+                       // Clean up the element expando
+                       try {
+                               delete elem[ expando ];
+                       } catch(e){
+                               // IE has trouble directly removing the expando
+                               // but it's ok with using removeAttribute
+                               if ( elem.removeAttribute )
+                                       elem.removeAttribute( expando );
+                       }
+
+                       // Completely remove the data cache
+                       delete jQuery.cache[ id ];
+               }
+       },
 
        // args is for internal usage only
        each: function( obj, fn, args ) {
@@ -855,14 +949,16 @@ jQuery.extend({
        },
 
        unique: function(first) {
-               var r = [], num = jQuery.mergeNum++;
+               var r = [], done = {};
 
                try {
-                       for ( var i = 0, fl = first.length; i < fl; i++ )
-                               if ( num != first[i].mergeNum ) {
-                                       first[i].mergeNum = num;
+                       for ( var i = 0, fl = first.length; i < fl; i++ ) {
+                               var id = jQuery.data(first[i]);
+                               if ( !done[id] ) {
+                                       done[id] = true;
                                        r.push(first[i]);
                                }
+                       }
                } catch(e) {
                        r = first;
                }
@@ -870,8 +966,6 @@ jQuery.extend({
                return r;
        },
 
-       mergeNum: 0,
-
        grep: function(elems, fn, inv) {
                // If a string is passed in for the function, make a function
                // for it (a handy shortcut)
@@ -950,9 +1044,11 @@ jQuery.extend({
 
 jQuery.each({
        parent: "a.parentNode",
-       parents: "jQuery.parents(a)",
+       parents: "jQuery.dir(a,'parentNode')",
        next: "jQuery.nth(a,2,'nextSibling')",
        prev: "jQuery.nth(a,2,'previousSibling')",
+       nextAll: "jQuery.dir(a,'nextSibling')",
+       prevAll: "jQuery.dir(a,'previousSibling')",
        siblings: "jQuery.sibling(a.parentNode.firstChild,a)",
        children: "jQuery.sibling(a.firstChild)",
        contents: "jQuery.nodeName(a,'iframe')?a.contentDocument||a.contentWindow.document:jQuery.makeArray(a.childNodes)"
@@ -996,10 +1092,15 @@ jQuery.each( {
                jQuery.className[ jQuery.className.has(this,c) ? "remove" : "add" ](this, c);
        },
        remove: function(a){
-               if ( !a || jQuery.filter( a, [this] ).r.length )
+               if ( !a || jQuery.filter( a, [this] ).r.length ) {
+                       jQuery.removeData( this );
                        this.parentNode.removeChild( this );
+               }
        },
        empty: function() {
+               // Clean up the cache
+               jQuery("*", this).each(function(){ jQuery.removeData(this); });
+
                while ( this.firstChild )
                        this.removeChild( this.firstChild );
        }
@@ -1009,10 +1110,20 @@ jQuery.each( {
        };
 });
 
-jQuery.each( [ "height", "width" ], function(i,n){
+jQuery.each( [ "Height", "Width" ], function(i,name){
+       var n = name.toLowerCase();
+       
        jQuery.fn[ n ] = function(h) {
-               return h == undefined ?
-                       ( this.length ? jQuery.css( this[0], n ) : null ) :
-                       this.css( n, h.constructor == String ? h : h + "px" );
+               return this[0] == window ?
+                       jQuery.browser.safari && self["inner" + name] ||
+                       jQuery.boxModel && Math.max(document.documentElement["client" + name], document.body["client" + name]) ||
+                       document.body["client" + name] :
+               
+                       this[0] == document ?
+                               Math.max( document.body["scroll" + name], document.body["offset" + name] ) :
+        
+                               h == undefined ?
+                                       ( this.length ? jQuery.css( this[0], n ) : null ) :
+                                       this.css( n, h.constructor == String ? h : h + "px" );
        };
 });