X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fcore.js;h=0bf0cb4b7125c69243460b2d48c4cba4f45f6bf9;hb=158fa822dea3198de5a4bcff3955b869ebb758c8;hp=edd2c94d891a76e173f4975521540cf297b57146;hpb=cbf591152c9f61381e552c9a15bb7c339f1451a9;p=jquery.git diff --git a/src/core.js b/src/core.js index edd2c94..0bf0cb4 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 @@ -59,7 +59,7 @@ var jQuery = function( selector, context ) { // Has the ready events already been bound? readyBound = false, - + // The deferred used on DOM ready readyList, @@ -78,7 +78,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 +113,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 +131,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 +173,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 +224,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 +254,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 +289,7 @@ jQuery.fn = jQuery.prototype = { }, end: function() { - return this.prevObject || jQuery(null); + return this.prevObject || this.constructor(null); }, // For internal use only. @@ -406,7 +408,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 +545,7 @@ jQuery.extend({ jQuery.error( "Invalid JSON: " + data ); } }, - + // Cross-browser xml parsing // (xml & tmp used internally) parseXML: function( data , xml , tmp ) { @@ -556,13 +558,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; }, @@ -800,10 +802,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 +816,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 +870,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,25 +889,25 @@ 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 + + // Add errorDeferred methods and redefine cancel 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, @@ -913,7 +915,7 @@ jQuery.extend({ // 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 ) { + jQuery.each( "then done fail isResolved isRejected".split( " " ) , function( _ , method ) { obj[ method ] = deferred[ method ]; }); obj.promise = function() { @@ -923,18 +925,18 @@ jQuery.extend({ } } ); - + // 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; }, @@ -960,6 +962,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: {} }); @@ -1034,11 +1055,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);