X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fjquery%2Fjquery.js;h=d9292ed697c36396cd2b8f6f1b9e1b73985a8f3d;hb=ff4f265bc0273bda0c8873d470aefa20170abc41;hp=edcaee20d3e7b0bcb99f30c952b8125b65847f78;hpb=610149fd19c087e51ccd5975ba2c2e5c3bfe49a8;p=jquery.git diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js index edcaee2..d9292ed 100644 --- a/src/jquery/jquery.js +++ b/src/jquery/jquery.js @@ -26,37 +26,8 @@ var jQuery = function(a,c) { // If the context is global, return a new object if ( window == this ) return new jQuery(a,c); - - // Make sure that a selection was provided - a = a || document; - - // HANDLE: $(function) - // Shortcut for document ready - if ( jQuery.isFunction(a) ) - return new jQuery(document)[ jQuery.fn.ready ? "ready" : "load" ]( a ); - // Handle HTML strings - if ( typeof a == "string" ) { - // HANDLE: $(html) -> $(array) - var m = /^[^<]*(<(.|\s)+>)[^>]*$/.exec(a); - if ( m ) - a = jQuery.clean( [ m[1] ] ); - - // HANDLE: $(expr) - else - return new jQuery( c ).find( a ); - } - - return this.setArray( - // HANDLE: $(array) - a.constructor == Array && a || - - // 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 ) || - - // HANDLE: $(*) - [ a ] ); + return this.init(a,c); }; // Map over the $ in case of overwrite @@ -170,6 +141,48 @@ var $ = jQuery; jQuery.fn = jQuery.prototype = { /** + * Initialize a new jQuery object + * + * @private + * @name init + * @param String|Function|Element|Array|jQuery a selector + * @param jQuery|Element|Array c context + * @cat Core + */ + init: function(a,c) { + // Make sure that a selection was provided + a = a || document; + + // HANDLE: $(function) + // Shortcut for document ready + if ( jQuery.isFunction(a) ) + return new jQuery(document)[ jQuery.fn.ready ? "ready" : "load" ]( a ); + + // Handle HTML strings + if ( typeof a == "string" ) { + // HANDLE: $(html) -> $(array) + var m = /^[^<]*(<(.|\s)+>)[^>]*$/.exec(a); + if ( m ) + a = jQuery.clean( [ m[1] ] ); + + // HANDLE: $(expr) + else + return new jQuery( c ).find( a ); + } + + return this.setArray( + // HANDLE: $(array) + a.constructor == Array && a || + + // HANDLE: $(arraylike) + // Watch for when an array-like object is passed as the selector + (a.jquery || a.length && a != window && (!a.nodeType || (jQuery.browser.msie && a.elements)) && a[0] != undefined && a[0].nodeType) && jQuery.makeArray( a ) || + + // HANDLE: $(*) + [ a ] ); + }, + + /** * The current version of jQuery. * * @private @@ -840,7 +853,7 @@ jQuery.fn = jQuery.prototype = { */ clone: function(deep) { return this.pushStack( jQuery.map( this, function(a){ - var a = a.cloneNode( deep != undefined ? deep : true ); + a = a.cloneNode( deep != undefined ? deep : true ); a.$events = null; // drop $events expando to avoid firing incorrect events return a; }) ); @@ -1177,10 +1190,6 @@ jQuery.fn = jQuery.prototype = { /** * Extend one object with one or more others, returning the original, * modified, object. This is a great utility for simple inheritance. - * - * There is also an optional collision resolution function. Any time the target and - * merged object both contain a key this function is called. This may be used to create - * a recursive merge. (See example) Unless you know what this is, you probably don't care. * * @example var settings = { validate: false, limit: 5, name: "foo" }; * var options = { validate: true, name: "bar" }; @@ -1194,19 +1203,8 @@ jQuery.fn = jQuery.prototype = { * @result settings == { validate: true, limit: 5, name: "bar" } * @desc Merge defaults and options, without modifying the defaults * - * @example var defaults = { validate: false, limit: 5, name: "foo", nested: {depth: false} }; - * var options = { validate: true, name: "bar", nested: {depth: true} }; - * var collision_resolver_fn = function(target, mergee) { - * // combine nested Objects, in this case the object being merged takes priority - * return jQuery.extend({}, target, mergee); - * } - * var settings = jQuery.extend({}, collision_resolver_fn, defaults, options); - * @result settings == { validate: true, limit: 5, name: "bar" } - * @desc Recursively merge defaults and options, without modifying the defaults - * * @name $.extend * @param Object target The object to extend - * @param Function (optional) collision resolution function. Hook to extend the merging behavior of $.extend(). See example. * @param Object prop1 The object that will be merged into the first. * @param Object propN (optional) More objects to merge into the first * @type Object @@ -1214,26 +1212,17 @@ jQuery.fn = jQuery.prototype = { */ jQuery.extend = jQuery.fn.extend = function() { // copy reference to target object - var resolver, prop, target = arguments[0], - a = 1; - + var target = arguments[0], a = 1; + // extend jQuery itself if only one argument is passed if ( arguments.length == 1 ) { target = this; a = 0; - } else if (jQuery.isFunction(arguments[a])) { - resolver = arguments[a++]; } - - while (prop = arguments[a++]) + var prop; + while ( (prop = arguments[a++]) != null ) // Extend the base object - for ( var i in prop ) { - if (resolver && target[i] && prop[i]) { - target[i] = resolver(target[i], prop[i]); - } else { - target[i] = prop[i]; - } - } + for ( var i in prop ) target[i] = prop[i]; // Return the modified object return target; @@ -1360,7 +1349,7 @@ jQuery.extend({ // internal only, use removeClass("class") remove: function( elem, c ){ - elem.className = c ? + elem.className = c != undefined ? jQuery.grep( elem.className.split(/\s+/), function(cur){ return !jQuery.className.has( c, cur ); }).join(" ") : ""; @@ -1489,7 +1478,7 @@ jQuery.extend({ !s.indexOf("", ""] || - (!s.indexOf("", ""] || !s.indexOf("", ""] || + !s.indexOf("", ""] || + [0,"",""]; // Go to html and back, then peel off extra wrappers @@ -1528,10 +1520,10 @@ jQuery.extend({ arg = jQuery.makeArray( div.childNodes ); } - if ( arg.length === 0 && !jQuery(arg).is("form, select") ) + if ( 0 === arg.length && !jQuery(arg).is("form, select") ) return; - if ( arg[0] == undefined || jQuery(arg).is("form, select") ) + if ( arg[0] == undefined || jQuery.nodeName(arg, "form") || arg.options ) r.push( arg ); else r = jQuery.merge( r, arg ); @@ -1663,7 +1655,7 @@ jQuery.extend({ var r = [], num = jQuery.mergeNum++; for ( var i = 0, fl = first.length; i < fl; i++ ) - if ( first[i].mergeNum != num ) { + if ( num != first[i].mergeNum ) { first[i].mergeNum = num; r.push(first[i]); } @@ -1807,7 +1799,7 @@ new function() { // Figure out what browser is being used jQuery.browser = { - version: b.match(/.+[xiae][\/ ]([\d.]+)/)[1], + version: b.match(/.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/)[1], safari: /webkit/.test(b), opera: /opera/.test(b), msie: /msie/.test(b) && !/opera/.test(b),