X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fjquery%2Fjquery.js;h=e58f895df21d94f54b2dc5cbfe92120c5f5dfde4;hb=495ecb70b2b097e7d4a1ffe46d44562210cdc051;hp=2c494d1157f98664dfbaa5ca74ed667971409771;hpb=a30b3211e68eeea04107059cc82b3c3026138337;p=jquery.git diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js index 2c494d1..e58f895 100644 --- a/src/jquery/jquery.js +++ b/src/jquery/jquery.js @@ -38,7 +38,7 @@ var jQuery = function(a,c) { // Handle HTML strings if ( typeof a == "string" ) { // HANDLE: $(html) -> $(array) - var m = /^[^<]*(<(.|\n)+>)[^>]*$/.exec(a); + var m = /^[^<]*(<(.|\s)+>)[^>]*$/.exec(a); if ( m ) a = jQuery.clean( [ m[1] ] ); @@ -257,9 +257,9 @@ jQuery.fn = jQuery.prototype = { * @cat Core */ pushStack: function( a ) { - var ret = jQuery(this); + var ret = jQuery(a); ret.prevObject = this; - return ret.setArray( a ); + return ret; }, /** @@ -803,7 +803,7 @@ jQuery.fn = jQuery.prototype = { find: function(t) { return this.pushStack( jQuery.map( this, function(a){ return jQuery.find(t,a); - }) ); + }), t ); }, /** @@ -986,7 +986,7 @@ jQuery.fn = jQuery.prototype = { this.get(), t.constructor == String ? jQuery(t).get() : - t.length != undefined && !t.nodeName ? + t.length != undefined && (!t.nodeName || t.nodeName == "FORM") ? t : [t] ) ); }, @@ -1228,6 +1228,11 @@ jQuery.extend({ return !!fn && typeof fn != "string" && typeof fn[0] == "undefined" && /function/i.test( fn + "" ); }, + + // check if an element is in a XML document + isXMLDoc: function(elem) { + return elem.tagName && elem.ownerDocument && !elem.ownerDocument.body; + }, nodeName: function( elem, name ) { return elem.nodeName && elem.nodeName.toUpperCase() == name.toUpperCase(); @@ -1281,10 +1286,9 @@ jQuery.extend({ var exclude = /z-?index|font-?weight|opacity|zoom|line-?height/i; // Handle passing in a number to a CSS property - if ( value.constructor == Number && type == "curCSS" && !exclude.test(prop) ) - return value + "px"; - - return value; + return value && value.constructor == Number && type == "curCSS" && !exclude.test(prop) ? + value + "px" : + value; }, className: { @@ -1477,7 +1481,7 @@ jQuery.extend({ }, attr: function(elem, name, value){ - var fix = { + var fix = jQuery.isXMLDoc(elem) ? {} : { "for": "htmlFor", "class": "className", "float": jQuery.browser.msie ? "styleFloat" : "cssFloat", @@ -1508,6 +1512,8 @@ jQuery.extend({ // Mozilla doesn't play well with opacity 1 if ( name == "opacity" && jQuery.browser.mozilla && value == 1 ) value = 0.9999; + + // // Certain attributes only work when accessed via the old DOM 0 way if ( fix[name] ) { @@ -1519,7 +1525,8 @@ jQuery.extend({ // IE elem.getAttribute passes even for style else if ( elem.tagName ) { - if ( value != undefined ) elem.setAttribute( name, value ); + if ( value != undefined ) + elem.setAttribute( name, value ); return elem.getAttribute( name ); } else {