X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fcore.js;h=23b96442e961a929e01fd6f69a1a7eeb46817406;hb=957cd6fb2a2b7b8cfe9ac6b3f2b3cc2bc8163449;hp=cb9b528eca4d46b149bc0f947db4bc5acd691cb4;hpb=26eda09892459709d224f910038b8f6836bfd012;p=jquery.git diff --git a/src/core.js b/src/core.js index cb9b528..23b9644 100644 --- a/src/core.js +++ b/src/core.js @@ -20,7 +20,7 @@ var jQuery = function( selector, context ) { // A simple way to check for HTML strings or ID strings // (both of which we optimize for) - quickExpr = /^[^<]*(<(.|\s)+>)[^>]*$|^#([\w-]+)$/, + quickExpr = /^[^<]*(<[\w\W]+>)[^>]*$|^#([\w-]+)$/, // Is it a simple selector isSimple = /^.[^:#\[\.,]*$/, @@ -39,15 +39,14 @@ var jQuery = function( selector, context ) { push = Array.prototype.push, slice = Array.prototype.slice; -// Expose jQuery to the global object -window.jQuery = window.$ = jQuery; - jQuery.fn = jQuery.prototype = { init: function( selector, context ) { var match, elem, ret; // Handle $(""), $(null), or $(undefined) - if ( !selector ) return this; + if ( !selector ) { + return this; + } // Handle $(DOMElement) if ( selector.nodeType ) { @@ -70,12 +69,14 @@ jQuery.fn = jQuery.prototype = { // HANDLE: $("#id") } else { - elem = document.getElementById( match[3] ); + elem = document.getElementById( match[2] ); if ( elem ) { // Handle the case where IE and Opera return items // by name instead of ID - if ( elem.id !== match[3] ) return rootjQuery.find( selector ); + if ( elem.id !== match[2] ) { + return rootjQuery.find( selector ); + } // Otherwise, we inject the element directly into the jQuery object this.length++; @@ -313,7 +314,9 @@ jQuery.extend({ // check if an element is in a (or is an) XML document isXMLDoc: function( elem ) { - return (elem.ownerDocument || elem).documentElement.nodeName !== "HTML"; + // documentElement is verified for cases where it doesn't yet exist + // (such as loading iframes in IE - #4833) + return ((elem ? elem.ownerDocument || elem : 0).documentElement || 0).nodeName !== "HTML"; }, // Evalulates a script in a global context