deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Cut down on some more function calls for jQuery(...). Everything points back to the same root jQuery(document) object now. Going towards ticket #4240.

Browse source
This commit is contained in:
John Resig 2009-02-25 14:23:25 +00:00
parent 041fd5f2b5
commit 85e0945718
1 changed files with 18 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/core.js
View file

@ -10,7 +10,9 @@ var
jQuery = window.jQuery = window.$ = function( selector, context ) { jQuery = window.jQuery = window.$ = function( selector, context ) {
// The jQuery object is actually just the init constructor 'enhanced' // The jQuery object is actually just the init constructor 'enhanced'
return new jQuery.fn.init( selector, context ); return selector === undefined ?
rootjQuery :
new jQuery.fn.init( selector, context );
}, },
// A simple way to check for HTML strings or ID strings // A simple way to check for HTML strings or ID strings
@ -21,15 +23,9 @@ var
jQuery.fn = jQuery.prototype = { jQuery.fn = jQuery.prototype = {
init: function( selector, context ) { init: function( selector, context ) {
// Make sure that a selection was provided // Handle $("") or $(null)
if ( selector === undefined ) {
selector = document;
}
// Handle "", null
if ( !selector ) { if ( !selector ) {
this.length = 0; this.length = 0;
this.context = document;
return this; return this;
} }
@ -60,32 +56,30 @@ jQuery.fn = jQuery.prototype = {
// Handle the case where IE and Opera return items // Handle the case where IE and Opera return items
// by name instead of ID // by name instead of ID
if ( elem && elem.id != match[3] ) { if ( elem && elem.id != match[3] ) {
return jQuery().find( selector ); return rootjQuery.find( selector );
} }
// Otherwise, we inject the element directly into the jQuery object // Otherwise, we inject the element directly into the jQuery object
var ret = jQuery( elem || [] ); var ret = jQuery( elem || null );
ret.context = document; ret.context = document;
ret.selector = selector; ret.selector = selector;
return ret; return ret;
} }
// HANDLE: $(expr, [context]) // HANDLE: $(expr, $(...))
// (which is just equivalent to: $(content).find(expr) } else if ( !context || context.jquery ) {
} else if ( !context || context.nodeType ) { return (context || rootjQuery).find( selector );
this[0] = context || document;
this.length = 1;
this.context = context;
return this.find( selector );
// HANDLE: $(expr, context)
// (which is just equivalent to: $(content).find(expr)
} else { } else {
return (context.jquery ? context : jQuery( context )).find( selector ); return jQuery( context ).find( selector );
} }
// HANDLE: $(function) // HANDLE: $(function)
// Shortcut for document ready // Shortcut for document ready
} else if ( jQuery.isFunction( selector ) ) { } else if ( jQuery.isFunction( selector ) ) {
return jQuery( document ).ready( selector ); return rootjQuery.ready( selector );
} }
// Make sure that old selector state is passed along // Make sure that old selector state is passed along
@ -126,7 +120,7 @@ jQuery.fn = jQuery.prototype = {
// (returning the new matched element set) // (returning the new matched element set)
pushStack: function( elems, name, selector ) { pushStack: function( elems, name, selector ) {
// Build a new jQuery matched element set // Build a new jQuery matched element set
var ret = jQuery( elems ); var ret = jQuery( elems || null );
// Add the old object onto the stack (as a reference) // Add the old object onto the stack (as a reference)
ret.prevObject = this; ret.prevObject = this;
@ -282,7 +276,7 @@ jQuery.fn = jQuery.prototype = {
}, },
end: function() { end: function() {
return this.prevObject || jQuery( [] ); return this.prevObject || jQuery(null);
}, },
// For internal use only. // For internal use only.
@ -1164,6 +1158,9 @@ jQuery.extend({
} }
}); });
// All jQuery objects should point back to these
var rootjQuery = jQuery(document);
// Use of jQuery.browser is deprecated. // Use of jQuery.browser is deprecated.
// It's included for backwards compatibility and plugins, // It's included for backwards compatibility and plugins,
// although they should work to migrate away. // although they should work to migrate away.