X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;ds=inline;f=src%2Fjquery%2Fjquery.js;h=edcaee20d3e7b0bcb99f30c952b8125b65847f78;hb=610149fd19c087e51ccd5975ba2c2e5c3bfe49a8;hp=5347c9265345628ce9689d7d166759e3d628db54;hpb=94dfccc6dbb2dbf7b91e01622ff746c9c9f447d6;p=jquery.git diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js index 5347c92..edcaee2 100644 --- a/src/jquery/jquery.js +++ b/src/jquery/jquery.js @@ -1479,13 +1479,16 @@ jQuery.extend({ // Convert html string into DOM nodes if ( typeof arg == "string" ) { // Trim whitespace, otherwise indexOf won't work as expected - var s = jQuery.trim(arg), div = doc.createElement("div"), tb = []; + var s = jQuery.trim(arg).toLowerCase(), div = doc.createElement("div"), tb = []; var wrap = // option or optgroup !s.indexOf("", ""] || + !s.indexOf("", ""] || + (!s.indexOf("", ""] || @@ -1525,10 +1528,10 @@ jQuery.extend({ arg = jQuery.makeArray( div.childNodes ); } - if ( arg.length === 0 && !jQuery.nodeName(arg, "form") ) + if ( arg.length === 0 && !jQuery(arg).is("form, select") ) return; - - if ( arg[0] == undefined || jQuery.nodeName(arg, "form") ) + + if ( arg[0] == undefined || jQuery(arg).is("form, select") ) r.push( arg ); else r = jQuery.merge( r, arg ); @@ -1804,6 +1807,7 @@ new function() { // Figure out what browser is being used jQuery.browser = { + version: b.match(/.+[xiae][\/ ]([\d.]+)/)[1], safari: /webkit/.test(b), opera: /opera/.test(b), msie: /msie/.test(b) && !/opera/.test(b),