Skip to content
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

Recursive matcher #2 #41

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Recursive matcher #2 #41

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
733a735
Add a recursive matcher on top of upstream
Inviz Apr 22, 2011
4518bfe
Dont parse already parsed selector
Inviz Apr 22, 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
38 changes: 17 additions & 21 deletions Source/Slick.Finder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,33 +551,29 @@ local.pushUID = function(node, tag, id, classes, attributes, pseudos){
}
};

local.matchNode = function(node, selector){
if (this.isHTMLDocument && this.nativeMatchesSelector){
var reSingularCombinator = /^\!?[>+^]$/; // "+", ">", "^"
local.matchNode = function(node, selector, needle){
if (!needle && this.isHTMLDocument && this.nativeMatchesSelector){
try {
return this.nativeMatchesSelector.call(node, selector.replace(/\[([^=]+)=\s*([^'"\]]+?)\s*\]/g, '[$1="$2"]'));
} catch(matchError) {}
}

var parsed = this.Slick.parse(selector);
var parsed = ((selector.Slick) ? selector : this.Slick.parse(selector));
if (!parsed) return true;

// simple (single) selectors
var expressions = parsed.expressions, reversedExpressions, simpleExpCounter = 0, i;
for (i = 0; (currentExpression = expressions[i]); i++){
if (currentExpression.length == 1){
var exp = currentExpression[0];
if (this.matchSelector(node, (this.isXMLDocument) ? exp.tag : exp.tag.toUpperCase(), exp.id, exp.classes, exp.attributes, exp.pseudos)) return true;
simpleExpCounter++;
}
}

if (simpleExpCounter == parsed.length) return false;

var nodes = this.search(this.document, parsed), item;
for (i = 0; item = nodes[i++];){
if (item === node) return true;
parsed = parsed.reverse();
for (var i = 0, expression, expressions, built, length, multiple; expression = parsed.expressions[i]; i++) {
var first = expression[0];
if (local.matchSelector(node, (this.isXMLDocument) ? first.tag : first.tag.toUpperCase(), first.id, first.classes, first.attributes, first.pseudos)) { // matching first selector against element
if ((length = expression.length) == 1) continue;
if (!built) built = {Slick: true, expressions: [], length: 0};
built.expressions.push(expressions = []);
built.length++;
for (var j = 1; j < length; j++) expressions.push(expression[j]);
if (!multiple) multiple = !expression[expression.length - 1].combinator.match(reSingularCombinator);
} else return false;
}
return false;
var found = built ? this.search(node, built, null, !(multiple && needle)) : node;
return needle ? (multiple ? found.indexOf(needle) > -1 : found == needle) : !!found;
};

local.matchPseudo = function(node, name, argument){
Expand Down