rnotwhite = /\S/,
// Used for trimming whitespace
- rtrim = /^\s+|\s+$/g,
+ rtrim = /^(\s|\u00A0)+|(\s|\u00A0)+$/g,
// Match a standalone tag
- rsingleTag = /^<(\w+)\s*\/?>$/,
+ rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>)?$/,
// Keep a UserAgent string for use with jQuery.browser
userAgent = navigator.userAgent.toLowerCase(),
+
+ // Has the ready events already been bound?
+ readyBound = false,
+
+ // The functions to execute on DOM ready
+ readyList = [],
// Save a reference to some core methods
toString = Object.prototype.toString,
// Handle $(DOMElement)
if ( selector.nodeType ) {
this.context = this[0] = selector;
- this.length++;
+ this.length = 1;
return this;
}
}
// Otherwise, we inject the element directly into the jQuery object
- this.length++;
+ this.length = 1;
this[0] = elem;
}
this.context = selector.context;
}
- return this.setArray(jQuery.isArray( selector ) ?
- selector :
- jQuery.makeArray(selector));
+ return jQuery.isArray( selector ) ?
+ this.setArray( selector ) :
+ jQuery.makeArray( selector, this );
},
// Start with an empty selector
is: function( selector ) {
return !!selector && jQuery.filter( selector, this ).length > 0;
},
+
+ ready: function( fn ) {
+ // Attach the listeners
+ jQuery.bindReady();
+
+ // If the DOM is already ready
+ if ( jQuery.isReady ) {
+ // Execute the function immediately
+ fn.call( document, jQuery );
+
+ // Otherwise, remember the function for later
+ } else {
+ // Add the function to the wait list
+ readyList.push( fn );
+ }
+
+ return this;
+ },
// For internal use only.
// Behaves like an Array's method, not like a jQuery method.
continue;
}
- // Recurse if we're merging object values
- if ( deep && copy && typeof copy === "object" && !copy.nodeType ) {
- var clone;
-
- if ( src ) {
- clone = src;
- } else if ( jQuery.isArray(copy) ) {
- clone = [];
- } else if ( jQuery.isObject(copy) ) {
- clone = {};
- } else {
- clone = copy;
- }
+ // Recurse if we're merging object literal values
+ if ( deep && copy && jQuery.isPlainObject(copy) ) {
+ // Don't extend not object literals
+ var clone = src && jQuery.isPlainObject(src) ? src : {};
// Never move original objects, clone them
target[ name ] = jQuery.extend( deep, clone, copy );
return jQuery;
},
+
+ // Is the DOM ready to be used? Set to true once it occurs.
+ isReady: false,
+
+ // Handle when the DOM is ready
+ ready: function() {
+ // Make sure that the DOM is not already loaded
+ if ( !jQuery.isReady ) {
+ if ( !document.body ) {
+ return setTimeout( jQuery.ready, 13 );
+ }
+
+ // Remember that the DOM is ready
+ jQuery.isReady = true;
+
+ // If there are functions bound, to execute
+ if ( readyList ) {
+ // Execute all of them
+ var fn, i = 0;
+ while ( (fn = readyList[ i++ ]) ) {
+ fn.call( document, jQuery );
+ }
+
+ // Reset the list of functions
+ readyList = null;
+ }
+
+ // Trigger any bound ready events
+ if ( jQuery.fn.triggerHandler ) {
+ jQuery( document ).triggerHandler( "ready" );
+ }
+ }
+ },
+
+ bindReady: function() {
+ if ( readyBound ) { return; }
+ readyBound = true;
+
+ // Catch cases where $(document).ready() is called after the
+ // browser event has already occurred.
+ if ( document.readyState === "complete" ) {
+ return jQuery.ready();
+ }
+
+ // Mozilla, Opera and webkit nightlies currently support this event
+ if ( document.addEventListener ) {
+ // Use the handy event callback
+ document.addEventListener( "DOMContentLoaded", function DOMContentLoaded() {
+ document.removeEventListener( "DOMContentLoaded", DOMContentLoaded, false );
+ jQuery.ready();
+ }, false );
+
+ // A fallback to window.onload, that will always work
+ window.addEventListener( "load", jQuery.ready, false );
+
+ // If IE event model is used
+ } else if ( document.attachEvent ) {
+ // ensure firing before onload,
+ // maybe late but safe also for iframes
+ document.attachEvent("onreadystatechange", function onreadystatechange() {
+ // Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
+ if ( document.readyState === "complete" ) {
+ document.detachEvent( "onreadystatechange", onreadystatechange );
+ jQuery.ready();
+ }
+ });
+
+ // A fallback to window.onload, that will always work
+ window.attachEvent( "onload", jQuery.ready );
+
+ // If IE and not a frame
+ // continually check to see if the document is ready
+ var toplevel = false;
+
+ try {
+ toplevel = window.frameElement == null;
+ } catch(e){}
+
+ if ( document.documentElement.doScroll && toplevel ) {
+ doScrollCheck();
+
+ function doScrollCheck() {
+ if ( jQuery.isReady ) {
+ return;
+ }
+
+ try {
+ // If IE is used, use the trick by Diego Perini
+ // http://javascript.nwbox.com/IEContentLoaded/
+ document.documentElement.doScroll("left");
+ } catch( error ) {
+ setTimeout( doScrollCheck, 1 );
+ return;
+ }
+
+ // and execute any waiting functions
+ jQuery.ready();
+ }
+ }
+ }
+ },
// See test/unit/core.js for details concerning isFunction.
// Since version 1.3, DOM methods and functions like alert
return toString.call(obj) === "[object Array]";
},
- isObject: function( obj ) {
- if ( toString.call(obj) !== "[object Object]" ) {
+ isPlainObject: function( obj ) {
+ if ( toString.call(obj) !== "[object Object]" || typeof obj.nodeType === "number" ) {
+ return false;
+ }
+
+ // not own constructor property must be Object
+ if ( obj.constructor
+ && !hasOwnProperty.call(obj, "constructor")
+ && !hasOwnProperty.call(obj.constructor.prototype, "isPrototypeOf") ) {
return false;
}
//own properties are iterated firstly,
//so to speed up, we can test last one if it is own or not
-
+
var key;
for ( key in obj ) {}
- return !key || hasOwnProperty.call( obj, key );
+ return key === undefined || hasOwnProperty.call( obj, key );
},
isEmptyObject: function( obj ) {
return true;
},
- // check if an element is in a (or is an) XML document
- isXMLDoc: function( elem ) {
- // documentElement is verified for cases where it doesn't yet exist
- // (such as loading iframes in IE - #4833)
- var documentElement = (elem ? elem.ownerDocument || elem : 0).documentElement;
- return documentElement ? documentElement.nodeName !== "HTML" : false;
- },
-
// Evalulates a script in a global context
globalEval: function( data ) {
if ( data && rnotwhite.test(data) ) {
return (text || "").replace( rtrim, "" );
},
- makeArray: function( array ) {
- var ret = [], i;
+ // results is for internal usage only
+ makeArray: function( array, results ) {
+ var ret = results || [];
if ( array != null ) {
- i = array.length;
-
// The window, strings (and functions) also have 'length'
- if ( i == null || typeof array === "string" || jQuery.isFunction(array) || array.setInterval ) {
- ret[0] = array;
+ // The extra typeof function check is to prevent crashes
+ // in Safari 2 (See: #3039)
+ if ( array.length == null || typeof array === "string" || jQuery.isFunction(array) || (typeof array !== "function" && array.setInterval) ) {
+ push.call( ret, array );
} else {
- while ( i ) {
- ret[--i] = array[i];
- }
+ jQuery.merge( ret, array );
}
}
},
inArray: function( elem, array ) {
+ if ( array.indexOf ) {
+ return array.indexOf( elem );
+ }
+
for ( var i = 0, length = array.length; i < length; i++ ) {
if ( array[ i ] === elem ) {
return i;
},
merge: function( first, second ) {
- // We have to loop this way because IE & Opera overwrite the length
- // expando of getElementsByTagName
- var i = 0, elem, pos = first.length;
+ var pos, i = second.length;
- while ( (elem = second[ i++ ]) != null ) {
- first[ pos++ ] = elem;
+ // We have to get length this way when IE & Opera overwrite the length
+ // expando of getElementsByTagName
+ if ( i && i.nodeType ) {
+ for ( i = 0; second[i]; ++i ) {}
+ }
+
+ pos = i + first.length;
+
+ // Correct length for non Arrays
+ first.length = pos;
+
+ while ( i ) {
+ first[ --pos ] = second[ --i ];
}
return first;
return ret;
},
- map: function( elems, callback ) {
+ // arg is for internal usage only
+ map: function( elems, callback, arg ) {
var ret = [], value;
// Go through the array, translating each of the items to their
// new value (or values).
for ( var i = 0, length = elems.length; i < length; i++ ) {
- value = callback( elems[ i ], i );
+ value = callback( elems[ i ], i, arg );
if ( value != null ) {
ret[ ret.length ] = value;
// It's included for backwards compatibility and plugins,
// although they should work to migrate away.
browser: {
- version: (/.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/.exec(userAgent) || [0,'0'])[1],
- safari: /webkit/.test( userAgent ),
+ version: (/.*?(?:firefox|safari|opera|msie)[\/ ]([\d.]+)/.exec(userAgent) || [0,'0'])[1],
+ safari: /safari/.test( userAgent ),
opera: /opera/.test( userAgent ),
msie: /msie/.test( userAgent ) && !/opera/.test( userAgent ),
mozilla: /mozilla/.test( userAgent ) && !/(compatible|webkit)/.test( userAgent )
git.asbjorn.biz / jquery.git / blobdiff