X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fjquery%2Fjquery.js;h=741b13b53521f162760769a1530eeebbbe0585b1;hb=37407164803df62c4efb1332e7f94b56e693a108;hp=61a190e80e1d2b6ce8cb05e6a0518d8a044f5906;hpb=d0c68580e500a4b9ffd0bf577d82df6d0320659a;p=jquery.git diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js index 61a190e..741b13b 100644 --- a/src/jquery/jquery.js +++ b/src/jquery/jquery.js @@ -24,7 +24,7 @@ window.undefined = window.undefined; */ var jQuery = function(a,c) { // If the context is global, return a new object - if ( window == this ) + if ( window == this || !this.init ) return new jQuery(a,c); return this.init(a,c); @@ -176,7 +176,7 @@ jQuery.fn = jQuery.prototype = { // 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 ) || + (a.jquery || a.length && a != window && !a.nodeType && a[0] != undefined && a[0].nodeType) && jQuery.makeArray( a ) || // HANDLE: $(*) [ a ] ); @@ -565,7 +565,7 @@ jQuery.fn = jQuery.prototype = { * @cat DOM/Attributes */ text: function(e) { - if ( typeof e == "string" ) + if ( typeof e != "object" && e != null ) return this.empty().append( document.createTextNode( e ) ); var t = ""; @@ -811,7 +811,7 @@ jQuery.fn = jQuery.prototype = { /** * Searches for all elements that match the specified expression. - + * * This method is a good way to find additional descendant * elements with which to process. * @@ -830,9 +830,9 @@ jQuery.fn = jQuery.prototype = { * @cat DOM/Traversing */ find: function(t) { - return this.pushStack( jQuery.unique( jQuery.map( this, function(a){ - return jQuery.find(t,a); - }) ), t ); + var data = jQuery.map(this, function(a){ return jQuery.find(t,a); }); + return this.pushStack( /[^+>] [^+>]/.test( t ) || t.indexOf("..") > -1 ? + jQuery.unique( data ) : data ); }, /** @@ -852,11 +852,30 @@ jQuery.fn = jQuery.prototype = { * @cat DOM/Manipulation */ clone: function(deep) { - return this.pushStack( jQuery.map( this, function(a){ - a = a.cloneNode( deep != undefined ? deep : true ); - a.$events = null; // drop $events expando to avoid firing incorrect events - return a; + // Need to remove events on the element and its descendants + var $this = this.add(this.find("*")); + $this.each(function() { + this._$events = {}; + for (var type in this.$events) + this._$events[type] = jQuery.extend({},this.$events[type]); + }).unbind(); + + // Do the clone + var r = this.pushStack( jQuery.map( this, function(a){ + return a.cloneNode( deep != undefined ? deep : true ); }) ); + + // Add the events back to the original and its descendants + $this.each(function() { + var events = this._$events; + for (var type in events) + for (var handler in events[type]) + jQuery.event.add(this, type, events[type][handler], events[type][handler].data); + this._$events = null; + }); + + // Return the cloned set + return r; }, /** @@ -1152,9 +1171,14 @@ jQuery.fn = jQuery.prototype = { obj = this.getElementsByTagName("tbody")[0] || this.appendChild(document.createElement("tbody")); jQuery.each( a, function(){ - fn.apply( obj, [ clone ? this.cloneNode(true) : this ] ); + if ( jQuery.nodeName(this, "script") ) { + if ( this.src ) + jQuery.ajax({ url: this.src, async: false, dataType: "script" }); + else + (new Function( this.text || this.textContent || this.innerHTML || "" ))(); + } else + fn.apply( obj, [ clone ? this.cloneNode(true) : this ] ); }); - }); } }; @@ -1423,15 +1447,15 @@ jQuery.extend({ return ret == "" ? "1" : ret; } - if (prop == "float" || prop == "cssFloat") - prop = jQuery.browser.msie ? "styleFloat" : "cssFloat"; + if (prop.match(/float/i)) + prop = jQuery.styleFloat; if (!force && elem.style[prop]) ret = elem.style[prop]; else if (document.defaultView && document.defaultView.getComputedStyle) { - if (prop == "cssFloat" || prop == "styleFloat") + if (prop.match(/float/i)) prop = "float"; prop = prop.replace(/([A-Z])/g,"-$1").toLowerCase(); @@ -1447,6 +1471,9 @@ jQuery.extend({ ret = c && c.getPropertyValue(prop) || ""; }); + if ( prop == "opacity" && ret == "" ) + ret = "1"; + } else if (elem.currentStyle) { var newProp = prop.replace(/\-(\w)/g,function(m,c){return c.toUpperCase();}); ret = elem.currentStyle[prop] || elem.currentStyle[newProp]; @@ -1465,13 +1492,13 @@ jQuery.extend({ if ( arg.constructor == Number ) arg = arg.toString(); - // Convert html string into DOM nodes + // Convert html string into DOM nodes if ( typeof arg == "string" ) { // Trim whitespace, otherwise indexOf won't work as expected var s = jQuery.trim(arg).toLowerCase(), div = doc.createElement("div"), tb = []; var wrap = - // option or optgroup + // option or optgroup !s.indexOf("", ""] || @@ -1520,7 +1547,7 @@ jQuery.extend({ arg = jQuery.makeArray( div.childNodes ); } - if ( 0 === arg.length && !jQuery(arg).is("form, select") ) + if ( 0 === arg.length && (!jQuery.nodeName(arg, "form") && !jQuery.nodeName(arg, "select")) ) return; if ( arg[0] == undefined || jQuery.nodeName(arg, "form") || arg.options ) @@ -1534,47 +1561,21 @@ jQuery.extend({ }, attr: function(elem, name, value){ - var fix = jQuery.isXMLDoc(elem) ? {} : { - "for": "htmlFor", - "class": "className", - "float": jQuery.browser.msie ? "styleFloat" : "cssFloat", - cssFloat: jQuery.browser.msie ? "styleFloat" : "cssFloat", - innerHTML: "innerHTML", - className: "className", - value: "value", - disabled: "disabled", - checked: "checked", - readonly: "readOnly", - selected: "selected", - maxlength: "maxLength" - }; - - // IE actually uses filters for opacity ... elem is actually elem.style - if ( name == "opacity" && jQuery.browser.msie ) { - if ( value != undefined ) { - // IE has trouble with opacity if it does not have layout - // Force it by setting the zoom level - elem.zoom = 1; - - // Set the alpha filter to set the opacity - elem.filter = (elem.filter || "").replace(/alpha\([^)]*\)/,"") + - (parseFloat(value).toString() == "NaN" ? "" : "alpha(opacity=" + value * 100 + ")"); - } - - return elem.filter ? - (parseFloat( elem.filter.match(/opacity=([^)]*)/)[1] ) / 100).toString() : ""; - } + var fix = jQuery.isXMLDoc(elem) ? {} : jQuery.props; // Certain attributes only work when accessed via the old DOM 0 way if ( fix[name] ) { if ( value != undefined ) elem[fix[name]] = value; return elem[fix[name]]; + } else if ( jQuery.browser.msie && name == "style" ) + return jQuery.attr( elem.style, "cssText", value ); - } else if ( value == undefined && jQuery.browser.msie && jQuery.nodeName(elem, "form") && (name == "action" || name == "method") ) + else if ( value == undefined && jQuery.browser.msie && jQuery.nodeName(elem, "form") && (name == "action" || name == "method") ) return elem.getAttributeNode(name).nodeValue; // IE elem.getAttribute passes even for style else if ( elem.tagName ) { + if ( value != undefined ) elem.setAttribute( name, value ); if ( jQuery.browser.msie && /href|src/.test(name) && !jQuery.isXMLDoc(elem) ) return elem.getAttribute( name, 2 ); @@ -1582,6 +1583,21 @@ jQuery.extend({ // elem is actually elem.style ... set the style } else { + // IE actually uses filters for opacity + if ( name == "opacity" && jQuery.browser.msie ) { + if ( value != undefined ) { + // IE has trouble with opacity if it does not have layout + // Force it by setting the zoom level + elem.zoom = 1; + + // Set the alpha filter to set the opacity + elem.filter = (elem.filter || "").replace(/alpha\([^)]*\)/,"") + + (parseFloat(value).toString() == "NaN" ? "" : "alpha(opacity=" + value * 100 + ")"); + } + + return elem.filter ? + (parseFloat( elem.filter.match(/opacity=([^)]*)/)[1] ) / 100).toString() : ""; + } name = name.replace(/-([a-z])/ig,function(z,b){return b.toUpperCase();}); if ( value != undefined ) elem[name] = value; return elem[name]; @@ -1600,7 +1616,7 @@ jQuery.extend({ * @cat JavaScript */ trim: function(t){ - return t.replace(/^\s+|\s+$/g, ""); + return (t||"").replace(/^\s+|\s+$/g, ""); }, makeArray: function( a ) { @@ -1624,24 +1640,16 @@ jQuery.extend({ }, /** - * Merge two arrays together, removing all duplicates. - * - * The result is the altered first argument with - * the unique elements from the second array added. + * Merge two arrays together by concatenating them. * * @example $.merge( [0,1,2], [2,3,4] ) - * @result [0,1,2,3,4] - * @desc Merges two arrays, removing the duplicate 2 - * - * @example var array = [3,2,1]; - * $.merge( array, [4,3,2] ) - * @result array == [3,2,1,4] - * @desc Merges two arrays, removing the duplicates 3 and 2 + * @result [0,1,2,2,3,4] + * @desc Merges two arrays. * * @name $.merge * @type Array - * @param Array first The first array to merge, the unique elements of second added. - * @param Array second The second array to merge into the first, unaltered. + * @param Array first The first array to merge, the elements of second are added. + * @param Array second The second array to append to the first, unaltered. * @cat JavaScript */ merge: function(first, second) { @@ -1652,14 +1660,30 @@ jQuery.extend({ return first; }, + /** + * Reduce an array (of jQuery objects only) to its unique elements. + * + * @example $.unique( [x1, x2, x3, x2, x3] ) + * @result [x1, x2, x3] + * @desc Reduces the arrays of jQuery objects to unique elements by removing the duplicates of x2 and x3 + * + * @name $.unique + * @type Array + * @param Array array The array to reduce to its unique jQuery objects. + * @cat JavaScript + */ unique: function(first) { var r = [], num = jQuery.mergeNum++; - for ( var i = 0, fl = first.length; i < fl; i++ ) - if ( num != first[i].mergeNum ) { - first[i].mergeNum = num; - r.push(first[i]); - } + try { + for ( var i = 0, fl = first.length; i < fl; i++ ) + if ( num != first[i].mergeNum ) { + first[i].mergeNum = num; + r.push(first[i]); + } + } catch(e) { + r = first; + } return r; }, @@ -1746,7 +1770,7 @@ jQuery.extend({ if ( typeof fn == "string" ) fn = new Function("a","return " + fn); - var result = [], r = []; + var result = []; // Go through the array, translating each of the items to their // new value (or values). @@ -1800,7 +1824,7 @@ new function() { // Figure out what browser is being used jQuery.browser = { - version: b.match(/.+(?:rv|it|ra|ie)[\/: ]([\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), @@ -1809,6 +1833,25 @@ new function() { // Check to see if the W3C box model is being used jQuery.boxModel = !jQuery.browser.msie || document.compatMode == "CSS1Compat"; + + jQuery.styleFloat = jQuery.browser.msie ? "styleFloat" : "cssFloat", + + jQuery.props = { + "for": "htmlFor", + "class": "className", + "float": jQuery.styleFloat, + cssFloat: jQuery.styleFloat, + styleFloat: jQuery.styleFloat, + innerHTML: "innerHTML", + className: "className", + value: "value", + disabled: "disabled", + checked: "checked", + readonly: "readOnly", + selected: "selected", + maxlength: "maxLength" + }; + }; /**