Skip to content

Fix + and > selectors when there is no sibling/parent (closes gh #16). #17

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

Open
cscott wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix + and > selectors when there is no sibling/parent (closes gh #16). #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions lib/zest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,12 +513,16 @@ var combinators = {
},
'>': function(test) {
return function(el) {
return test(el = el.parentNode) && el;
if (el = el.parentNode) {
return test(el) && el;
}
};
},
'+': function(test) {
return function(el) {
return test(el = prev(el)) && el;
if (el = prev(el)) {
return test(el) && el;
}
};
},
'~': function(test) {
Expand Down
15 changes: 12 additions & 3 deletions test/test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ var assert = {
}
};

assert.selector = function(sel) {
assert.selector = function(sel, node) {
try {
var got = zest(sel)
var got = zest(sel, node)
//, expected = Sizzle(sel)
, expected = slice(document.querySelectorAll(sel));
, expected = slice((node || document).querySelectorAll(sel));
} catch(e) {
return true;
}
Expand Down Expand Up @@ -75,6 +75,8 @@ assert.selector = function(sel) {
var runTests = function() {
assert.selector('body > header > h1');
assert.selector('h1');
assert.selector('h1 + h1');
assert.selector('li + li');
assert.selector('*');
assert.selector('article > header');
assert.selector('header + p');
Expand Down Expand Up @@ -104,6 +106,13 @@ var runTests = function() {
// this test wont pass because when it comes to groupings
// zest doesn't get the order of the elements exactly perfect
//assert.selector('a, h1');

var div = document.createElement('div');
div.innerHTML = '<h1>foo</h1>';
assert.selector('h1', div);
assert.selector('div > h1', div);
assert.selector('* > div > h1', div);

};

var bench = function(sel, times) {
Expand Down