X-Git-Url: http://git.asbjorn.biz/?p=jquery.git;a=blobdiff_plain;f=src%2Fcore.js;h=f116ef4d10b3e027befc18324eea9fb07a83d858;hp=edd2c94d891a76e173f4975521540cf297b57146;hb=d343bfe528cbb8b08c3beb94cb33d1c444932f06;hpb=cbf591152c9f61381e552c9a15bb7c339f1451a9 diff --git a/src/core.js b/src/core.js index edd2c94..f116ef4 100644 --- a/src/core.js +++ b/src/core.js @@ -3,7 +3,7 @@ var jQuery = (function() { // Define a local copy of jQuery var jQuery = function( selector, context ) { // The jQuery object is actually just the init constructor 'enhanced' - return new jQuery.fn.init( selector, context ); + return new jQuery.fn.init( selector, context, rootjQuery ); }, // Map over jQuery in case of overwrite @@ -19,12 +19,8 @@ var jQuery = function( selector, context ) { // (both of which we optimize for) quickExpr = /^(?:[^<]*(<[\w\W]+>)[^>]*$|#([\w\-]+)$)/, - // Is it a simple selector - isSimple = /^.[^:#\[\.,]*$/, - // Check if a string has a non-whitespace character in it rnotwhite = /\S/, - rwhite = /\s/, // Used for trimming whitespace trimLeft = /^\s+/, @@ -59,10 +55,13 @@ var jQuery = function( selector, context ) { // Has the ready events already been bound? readyBound = false, - + // The deferred used on DOM ready readyList, + // Promise methods + promiseMethods = "then done fail isResolved isRejected promise".split( " " ), + // The ready event handler DOMContentLoaded, @@ -78,7 +77,8 @@ var jQuery = function( selector, context ) { class2type = {}; jQuery.fn = jQuery.prototype = { - init: function( selector, context ) { + constructor: jQuery, + init: function( selector, context, rootjQuery ) { var match, elem, ret, doc; // Handle $(""), $(null), or $(undefined) @@ -112,6 +112,7 @@ jQuery.fn = jQuery.prototype = { // HANDLE: $(html) -> $(array) if ( match[1] ) { + context = context instanceof jQuery ? context[0] : context; doc = (context ? context.ownerDocument || context : document); // If a single string is passed in and it's a single tag @@ -129,7 +130,7 @@ jQuery.fn = jQuery.prototype = { } else { ret = jQuery.buildFragment( [ match[1] ], [ doc ] ); - selector = (ret.cacheable ? ret.fragment.cloneNode(true) : ret.fragment).childNodes; + selector = (ret.cacheable ? jQuery(ret.fragment).clone()[0] : ret.fragment).childNodes; } return jQuery.merge( this, selector ); @@ -171,7 +172,7 @@ jQuery.fn = jQuery.prototype = { // HANDLE: $(expr, context) // (which is just equivalent to: $(context).find(expr) } else { - return jQuery( context ).find( selector ); + return this.constructor( context ).find( selector ); } // HANDLE: $(function) @@ -222,7 +223,7 @@ jQuery.fn = jQuery.prototype = { // (returning the new matched element set) pushStack: function( elems, name, selector ) { // Build a new jQuery matched element set - var ret = jQuery(); + var ret = this.constructor(); if ( jQuery.isArray( elems ) ) { push.apply( ret, elems ); @@ -252,13 +253,13 @@ jQuery.fn = jQuery.prototype = { each: function( callback, args ) { return jQuery.each( this, callback, args ); }, - + ready: function() { // Attach the listeners jQuery.bindReady(); - + // Change ready & apply - return ( jQuery.fn.ready = readyList.complete ).apply( this , arguments ); + return ( jQuery.fn.ready = readyList.done ).apply( this , arguments ); }, eq: function( i ) { @@ -287,7 +288,7 @@ jQuery.fn = jQuery.prototype = { }, end: function() { - return this.prevObject || jQuery(null); + return this.prevObject || this.constructor(null); }, // For internal use only. @@ -406,7 +407,7 @@ jQuery.extend({ // If there are functions bound, to execute readyList.fire( document , [ jQuery ] ); - + // Trigger any bound ready events if ( jQuery.fn.trigger ) { jQuery( document ).trigger( "ready" ).unbind( "ready" ); @@ -543,7 +544,7 @@ jQuery.extend({ jQuery.error( "Invalid JSON: " + data ); } }, - + // Cross-browser xml parsing // (xml & tmp used internally) parseXML: function( data , xml , tmp ) { @@ -556,13 +557,13 @@ jQuery.extend({ xml.async = "false"; xml.loadXML( data ); } - + tmp = xml.documentElement; - + if ( ! tmp || ! tmp.nodeName || tmp.nodeName === "parsererror" ) { jQuery.error( "Invalid XML: " + data ); } - + return xml; }, @@ -578,7 +579,7 @@ jQuery.extend({ script.type = "text/javascript"; - if ( jQuery.support.scriptEval ) { + if ( jQuery.support.scriptEval() ) { script.appendChild( document.createTextNode( data ) ); } else { script.text = data; @@ -800,10 +801,10 @@ jQuery.extend({ now: function() { return (new Date()).getTime(); }, - + // Create a simple deferred (one callbacks list) _Deferred: function() { - + var // callbacks list callbacks = [], // stored [ context , args ] @@ -814,48 +815,48 @@ jQuery.extend({ cancelled, // the deferred itself deferred = { - - // complete( f1, f2, ...) - complete: function () { - + + // done( f1, f2, ...) + done: function () { + if ( ! cancelled ) { - + var args = arguments, i, length, elem, type, _fired; - + if ( fired ) { _fired = fired; fired = 0; } - + for ( i = 0, length = args.length ; i < length ; i++ ) { elem = args[ i ]; type = jQuery.type( elem ); if ( type === "array" ) { - deferred.complete.apply( deferred , elem ); + deferred.done.apply( deferred , elem ); } else if ( type === "function" ) { callbacks.push( elem ); } } - + if ( _fired ) { deferred.fire( _fired[ 0 ] , _fired[ 1 ] ); } } - + return this; }, - + // resolve with given context and args fire: function( context , args ) { if ( ! cancelled && ! fired && ! firing ) { - + firing = 1; - + try { while( callbacks[ 0 ] ) { callbacks.shift().apply( context , args ); @@ -868,18 +869,18 @@ jQuery.extend({ } return this; }, - + // resolve with this as context and given arguments resolve: function() { deferred.fire( jQuery.isFunction( this.promise ) ? this.promise() : this , arguments ); return this; }, - + // Has this deferred been resolved? isResolved: function() { return !!( firing || fired ); }, - + // Cancel cancel: function() { cancelled = 1; @@ -887,63 +888,90 @@ jQuery.extend({ return this; } }; - + return deferred; }, - + // Full fledged deferred (two callbacks list) // Typical success/error system Deferred: function( func ) { - + var deferred = jQuery._Deferred(), - failDeferred = jQuery._Deferred(); - - // Add errorDeferred methods and redefine cancel + failDeferred = jQuery._Deferred(), + promise; + + // Add errorDeferred methods, then and promise jQuery.extend( deferred , { - then: function( completeCallbacks , failCallbacks ) { - deferred.complete( completeCallbacks ).fail( failCallbacks ); - return this; - }, - fail: failDeferred.complete, + then: function( doneCallbacks , failCallbacks ) { + deferred.done( doneCallbacks ).fail( failCallbacks ); + return this; + }, + fail: failDeferred.done, fireReject: failDeferred.fire, reject: failDeferred.resolve, isRejected: failDeferred.isResolved, // Get a promise for this deferred // If obj is provided, the promise aspect is added to the object - promise: function( obj ) { - obj = obj || {}; - jQuery.each( "then complete fail isResolved isRejected".split( " " ) , function( _ , method ) { - obj[ method ] = deferred[ method ]; - }); - obj.promise = function() { - return obj; - }; + // (i is used internally) + promise: function( obj , i ) { + if ( obj == null ) { + if ( promise ) { + return promise; + } + promise = obj = {}; + } + i = promiseMethods.length; + while( i-- ) { + obj[ promiseMethods[ i ] ] = deferred[ promiseMethods[ i ] ]; + } return obj; } } ); - + // Make sure only one callback list will be used deferred.then( failDeferred.cancel , deferred.cancel ); - + // Unexpose cancel delete deferred.cancel; - + // Call given func if any if ( func ) { func.call( deferred , deferred ); } - + return deferred; }, // Deferred helper when: function( object ) { - object = object && jQuery.isFunction( object.promise ) ? - object : - jQuery.Deferred().resolve( object ); - return object.promise(); + var args = arguments, + length = args.length, + deferred = length <= 1 && object && jQuery.isFunction( object.promise ) ? + object : + jQuery.Deferred(), + promise = deferred.promise(), + resolveArray; + + if ( length > 1 ) { + resolveArray = new Array( length ); + jQuery.each( args, function( index, element, args ) { + jQuery.when( element ).done( function( value ) { + args = arguments; + resolveArray[ index ] = args.length > 1 ? slice.call( args , 0 ) : value; + if( ! --length ) { + deferred.fire( promise, resolveArray ); + } + }).fail( function() { + deferred.fireReject( promise, arguments ); + }); + return !deferred.isRejected(); + }); + } else if ( deferred !== object ) { + deferred.resolve( object ); + } + return promise; }, // Use of jQuery.browser is frowned upon. @@ -960,6 +988,25 @@ jQuery.extend({ return { browser: match[1] || "", version: match[2] || "0" }; }, + subclass: function(){ + function jQuerySubclass( selector, context ) { + return new jQuerySubclass.fn.init( selector, context ); + } + jQuerySubclass.superclass = this; + jQuerySubclass.fn = jQuerySubclass.prototype = this(); + jQuerySubclass.fn.constructor = jQuerySubclass; + jQuerySubclass.subclass = this.subclass; + jQuerySubclass.fn.init = function init( selector, context ) { + if (context && context instanceof jQuery && !(context instanceof jQuerySubclass)){ + context = jQuerySubclass(context); + } + return jQuery.fn.init.call( this, selector, context, rootjQuerySubclass ); + }; + jQuerySubclass.fn.init.prototype = jQuerySubclass.fn; + var rootjQuerySubclass = jQuerySubclass(document); + return jQuerySubclass; + }, + browser: {} }); @@ -988,9 +1035,8 @@ if ( indexOf ) { }; } -// Verify that \s matches non-breaking spaces -// (IE fails on this test) -if ( !rwhite.test( "\xA0" ) ) { +// IE doesn't match non-breaking spaces with \s +if ( rnotwhite.test( "\xA0" ) ) { trimLeft = /^[\s\xA0]+/; trimRight = /[\s\xA0]+$/; } @@ -1034,11 +1080,6 @@ function doScrollCheck() { jQuery.ready(); } -// Expose jQuery as an Asynchronous Module -if ( typeof define === "function" ) { - define( "jquery", [], function () { return jQuery; } ); -} - // Expose jQuery to the global object return (window.jQuery = window.$ = jQuery);