Skip to content

Ticket 10799 #81

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
gibson042 wants to merge 3 commits into from
Closed

Ticket 10799 #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
213af0e
Test for non-qSA name selector against non-input elements. #10799.
samomania21 Nov 16, 2011
9a6e86d
Don't optimize with getElementsByName when it is limited to form cont…
samomania21 Nov 16, 2011
cdd2020
smaller file size increase
gibson042 Dec 10, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
136 changes: 68 additions & 68 deletions sizzle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ var Sizzle = function( selector, context, results, seed ) {
if ( context.nodeType !== 1 && context.nodeType !== 9 ) {
return [];
}

if ( !selector || typeof selector !== "string" ) {
return results;
}
Expand All @@ -44,17 +44,17 @@ var Sizzle = function( selector, context, results, seed ) {
contextXML = Sizzle.isXML( context ),
parts = [],
soFar = selector;

// Reset the position of the chunker regexp (start from head)
do {
chunker.exec( "" );
m = chunker.exec( soFar );

if ( m ) {
soFar = m[3];

parts.push( m[1] );

if ( m[2] ) {
extra = m[3];
break;
Expand All @@ -78,7 +78,7 @@ var Sizzle = function( selector, context, results, seed ) {
if ( Expr.relative[ selector ] ) {
selector += parts.shift();
}

set = posProcess( selector, set, seed );
}
}
Expand Down Expand Up @@ -206,7 +206,7 @@ Sizzle.find = function( expr, context, isXML ) {

for ( i = 0, len = Expr.order.length; i < len; i++ ) {
type = Expr.order[i];

if ( (match = Expr.leftMatch[ type ].exec( expr )) ) {
left = match[1];
match.splice( 1, 1 );
Expand Down Expand Up @@ -333,7 +333,7 @@ Sizzle.error = function( msg ) {
* @param {Array|Element} elem
*/
var getText = Sizzle.getText = function( elem ) {
var i, node,
var i, node,
nodeType = elem.nodeType,
ret = "";

Expand Down Expand Up @@ -368,7 +368,7 @@ var getText = Sizzle.getText = function( elem ) {
};

var Expr = Sizzle.selectors = {
order: [ "ID", "NAME", "TAG" ],
order: [ "ID", "TAG" ],

match: {
ID: /#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,
Expand Down Expand Up @@ -489,32 +489,23 @@ var Expr = Sizzle.selectors = {
find: {
ID: function( match, context, isXML ) {
if ( typeof context.getElementById !== "undefined" && !isXML ) {
var m = context.getElementById(match[1]);
var m = context.getElementById( match[1] );
// Check parentNode to catch when Blackberry 4.6 returns
// nodes that are no longer in the document #6963
return m && m.parentNode ? [m] : [];
}
},

NAME: function( match, context ) {
if ( typeof context.getElementsByName !== "undefined" ) {
var ret = [],
results = context.getElementsByName( match[1] );

for ( var i = 0, l = results.length; i < l; i++ ) {
if ( results[i].getAttribute("name") === match[1] ) {
ret.push( results[i] );
}
}

return ret.length === 0 ? null : ret;
}
try {
return context.getElementsByName( match[1] );
} catch( getElementsByNameError ) {}
},

TAG: function( match, context ) {
if ( typeof context.getElementsByTagName !== "undefined" ) {
try {
return context.getElementsByTagName( match[1] );
}
} catch( getElementsByTagNameError ) {}
}
},
preFilter: {
Expand Down Expand Up @@ -578,7 +569,7 @@ var Expr = Sizzle.selectors = {

ATTR: function( match, curLoop, inplace, result, not, isXML ) {
var name = match[1] = match[1].replace( rBackslash, "" );

if ( !isXML && Expr.attrMap[name] ) {
match[1] = Expr.attrMap[name];
}
Expand Down Expand Up @@ -612,7 +603,7 @@ var Expr = Sizzle.selectors = {
} else if ( Expr.match.POS.test( match[0] ) || Expr.match.CHILD.test( match[0] ) ) {
return true;
}

return match;
},

Expand All @@ -622,7 +613,7 @@ var Expr = Sizzle.selectors = {
return match;
}
},

filters: {
enabled: function( elem ) {
return elem.disabled === false && elem.type !== "hidden";
Expand All @@ -635,14 +626,14 @@ var Expr = Sizzle.selectors = {
checked: function( elem ) {
return elem.checked === true;
},

selected: function( elem ) {
// Accessing this property makes selected-by-default
// options in Safari work properly
if ( elem.parentNode ) {
elem.parentNode.selectedIndex;
}

return elem.selected === true;
},

Expand All @@ -664,7 +655,7 @@ var Expr = Sizzle.selectors = {

text: function( elem ) {
var attr = elem.getAttribute( "type" ), type = elem.type;
// IE6 and 7 will map elem.type to 'text' for new HTML5 types (search, etc)
// IE6 and 7 will map elem.type to 'text' for new HTML5 types (search, etc)
// use getAttribute instead to test this case
return elem.nodeName.toLowerCase() === "input" && "text" === type && ( attr === type || attr === null );
},
Expand Down Expand Up @@ -782,22 +773,23 @@ var Expr = Sizzle.selectors = {
switch ( type ) {
case "only":
case "first":
while ( (node = node.previousSibling) ) {
if ( node.nodeType === 1 ) {
return false;
while ( (node = node.previousSibling) ) {
if ( node.nodeType === 1 ) {
return false;
}
}

if ( type === "first" ) {
return true;
if ( type === "first" ) {
return true;
}

node = elem;

/* falls through */
case "last":
while ( (node = node.nextSibling) ) {
if ( node.nodeType === 1 ) {
return false;
while ( (node = node.nextSibling) ) {
if ( node.nodeType === 1 ) {
return false;
}
}

Expand All @@ -810,22 +802,22 @@ var Expr = Sizzle.selectors = {
if ( first === 1 && last === 0 ) {
return true;
}

doneName = match[0];
parent = elem.parentNode;

if ( parent && (parent[ expando ] !== doneName || !elem.nodeIndex) ) {
count = 0;

for ( node = parent.firstChild; node; node = node.nextSibling ) {
if ( node.nodeType === 1 ) {
node.nodeIndex = ++count;
}
}
}

parent[ expando ] = doneName;
}

diff = elem.nodeIndex - last;

if ( first === 0 ) {
Expand All @@ -844,7 +836,7 @@ var Expr = Sizzle.selectors = {
TAG: function( elem, match ) {
return (match === "*" && elem.nodeType === 1) || !!elem.nodeName && elem.nodeName.toLowerCase() === match;
},

CLASS: function( elem, match ) {
return (" " + (elem.className || elem.getAttribute("class")) + " ")
.indexOf( match ) > -1;
Expand Down Expand Up @@ -914,7 +906,7 @@ var makeArray = function( array, results ) {
results.push.apply( results, array );
return results;
}

return array;
};

Expand Down Expand Up @@ -1047,25 +1039,33 @@ if ( document.documentElement.compareDocumentPosition ) {
};
}

// Check to see if the browser returns elements by name when
// querying by getElementById (and provide a workaround)
// Optimize for browsers with compatible getElementsByName
// Workaround browsers that return by name from getElementById
(function(){
// We're going to inject a fake input element with a specified name
// We're going to inject an input and non-input element with the same name
var form = document.createElement("div"),
id = "script" + (new Date()).getTime(),
root = document.documentElement;
id = "script" + ( - new Date() );

form.innerHTML = "<a name='" + id + "'/>";
form.id = id + 0;
form.innerHTML = "<a name='" + id + "'/><div name='" + id + "'/>";

// Inject it into the root element, check its status, and remove it quickly
root.insertBefore( form, root.firstChild );
document.documentElement.insertBefore( form, document.documentElement.firstChild );

// The workaround has to do additional checks after a getElementById
// Optimize NAME checks if the browser provides a compatible getElementsByName
// (returning all elements with matching name and not the one with matching id)
if ( document.getElementsByName &&
document.getElementsByName( id ).length === 2 + document.getElementsByName( id + 0 ).length ) {

Expr.order.splice(1, 0, "NAME");
}

// The getElementById workaround has to do additional checks
// Which slows things down for other browsers (hence the branching)
if ( document.getElementById( id ) ) {
Expr.find.ID = function( match, context, isXML ) {
if ( typeof context.getElementById !== "undefined" && !isXML ) {
var m = context.getElementById(match[1]);
var m = context.getElementById( match[1] );

return m ?
m.id === match[1] || typeof m.getAttributeNode !== "undefined" && m.getAttributeNode("id").nodeValue === match[1] ?
Expand All @@ -1082,10 +1082,10 @@ if ( document.documentElement.compareDocumentPosition ) {
};
}

root.removeChild( form );
document.documentElement.removeChild( form );

// release memory in IE
root = form = null;
form = null;
})();

(function(){
Expand Down Expand Up @@ -1146,7 +1146,7 @@ if ( document.querySelectorAll ) {
if ( div.querySelectorAll && div.querySelectorAll(".TEST").length === 0 ) {
return;
}

Sizzle = function( query, context, extra, seed ) {
context = context || document;

Expand All @@ -1155,24 +1155,24 @@ if ( document.querySelectorAll ) {
if ( !seed && !Sizzle.isXML(context) ) {
// See if we find a selector to speed up
var match = /^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec( query );

if ( match && (context.nodeType === 1 || context.nodeType === 9) ) {
// Speed-up: Sizzle("TAG")
if ( match[1] ) {
return makeArray( context.getElementsByTagName( query ), extra );

// Speed-up: Sizzle(".CLASS")
} else if ( match[2] && Expr.find.CLASS && context.getElementsByClassName ) {
return makeArray( context.getElementsByClassName( match[2] ), extra );
}
}

if ( context.nodeType === 9 ) {
// Speed-up: Sizzle("body")
// The body element only exists once, optimize finding it
if ( query === "body" && context.body ) {
return makeArray( [ context.body ], extra );

// Speed-up: Sizzle("#ID")
} else if ( match && match[3] ) {
var elem = context.getElementById( match[3] );
Expand All @@ -1185,12 +1185,12 @@ if ( document.querySelectorAll ) {
if ( elem.id === match[3] ) {
return makeArray( [ elem ], extra );
}

} else {
return makeArray( [], extra );
}
}

try {
return makeArray( context.querySelectorAll(query), extra );
} catch(qsaError) {}
Expand Down Expand Up @@ -1228,7 +1228,7 @@ if ( document.querySelectorAll ) {
}
}
}

return oldSizzle(query, context, extra, seed);
};

Expand All @@ -1255,7 +1255,7 @@ if ( document.querySelectorAll ) {
// This should fail with an exception
// Gecko does not error, returns false instead
matches.call( document.documentElement, "[test!='']:sizzle" );

} catch( pseudoError ) {
pseudoWorks = true;
}
Expand All @@ -1265,7 +1265,7 @@ if ( document.querySelectorAll ) {
expr = expr.replace(/\=\s*([^'"\]]*)\s*\]/g, "='$1']");

if ( !Sizzle.isXML( node ) ) {
try {
try {
if ( pseudoWorks || !Expr.match.PSEUDO.test( expr ) && !/!=/.test( expr ) ) {
var ret = matches.call( node, expr );

Expand Down Expand Up @@ -1302,7 +1302,7 @@ if ( document.querySelectorAll ) {
if ( div.getElementsByClassName("e").length === 1 ) {
return;
}

Expr.order.splice(1, 0, "CLASS");
Expr.find.CLASS = function( match, context, isXML ) {
if ( typeof context.getElementsByClassName !== "undefined" && !isXML ) {
Expand Down Expand Up @@ -1353,7 +1353,7 @@ function dirCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {

if ( elem ) {
var match = false;

elem = elem[dir];

while ( elem ) {
Expand Down Expand Up @@ -1406,7 +1406,7 @@ if ( document.documentElement.contains ) {

Sizzle.isXML = function( elem ) {
// documentElement is verified for cases where it doesn't yet exist
// (such as loading iframes in IE - #4833)
// (such as loading iframes in IE - #4833)
var documentElement = (elem ? elem.ownerDocument || elem : 0).documentElement;

return documentElement ? documentElement.nodeName !== "HTML" : false;
Expand Down
Loading