X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fcore.js;h=1236f1c65771141a53baeb86acf75e016f796472;hb=415a0916b54a0dd3123893d67cc9091dd8ebe1d6;hp=ac45d6275daee8119a535ff705dd15198afd2692;hpb=3a4e1233aa2acabee0d0267d54c2d1112fbdcad4;p=jquery.git diff --git a/src/core.js b/src/core.js index ac45d62..1236f1c 100644 --- a/src/core.js +++ b/src/core.js @@ -13,12 +13,11 @@ 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", @@ -233,17 +232,23 @@ jQuery.fn = jQuery.prototype = { var ret = this.map(function(){ return this.outerHTML ? jQuery(this.outerHTML)[0] : this.cloneNode(true); }); - - if (events === true) { - var clone = ret.find("*").andSelf(); + // 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 ret; @@ -277,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] ) ); }, @@ -292,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 if ( jQuery.nodeName(elem, "select") ) { 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 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; + // 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 if ( one ) + // We don't need an array for one selects + if ( one ) return val; - // Multi-Selects return an array a.push(val); } } - return a; + // Multi-Selects return an array + a.push(val); + } + } + + return a; - // Everything else, we just grab the value } else + // 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 ) { @@ -329,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 ) ); }, @@ -359,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; @@ -411,7 +463,7 @@ jQuery.extend = jQuery.fn.extend = function() { return target; }; -var expando = "jQuery" + (new Date()).getTime(), uuid = 0; +var expando = "jQuery" + (new Date()).getTime(), uuid = 0, win = {}; jQuery.extend({ noConflict: function(deep) { @@ -456,6 +508,8 @@ jQuery.extend({ cache: {}, data: function( elem, name, data ) { + elem = elem == window ? win : elem; + var id = elem[ expando ]; // Compute a unique ID for the element @@ -476,18 +530,22 @@ jQuery.extend({ }, 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 ) { - // 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 ); + 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 { @@ -497,7 +555,8 @@ jQuery.extend({ } catch(e){ // IE has trouble directly removing the expando // but it's ok with using removeAttribute - elem.removeAttribute( expando ); + if ( elem.removeAttribute ) + elem.removeAttribute( expando ); } // Completely remove the data cache @@ -985,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)" @@ -1049,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" ); }; });