Skip to content

Bug fixes and improvements, tests included #3

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
Gi60s wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Bug fixes and improvements, tests included #3

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
d7f5754
Add ability to run scoped queries when the parent node is a document …
Gi60s Oct 29, 2014
5465f9a
Improved regular expressions to avoid false positives.
Gi60s Oct 29, 2014
ceb7f58
Added tests for complex queries and for querying within document frag…
Gi60s Oct 30, 2014
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
34 changes: 23 additions & 11 deletions src/scopedQuerySelectorShim.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@
container.querySelectorAll(':scope *');
}
catch (e) {
// Match usage of scope
var scopeRE = /^\s*:scope/gi;
var rxTest = /(?:^|,)\s*:scope\s+/,
rxStart = /^\s*:scope\s+/i,
rxOthers = /,\s*:scope\s+/gi;

// Overrides
function overrideNodeMethod(prototype, methodName) {
Expand All @@ -23,20 +24,25 @@

// Override the method
prototype[methodName] = function(query) {
var nodeList,
gaveId = false,
gaveContainer = false;
var nodeList, parentNode, frag, idSelector,
gaveId = false,
gaveContainer = false,
parentIsFragment = false;

if (query.match(scopeRE)) {
// Remove :scope
query = query.replace(scopeRE, '');
if (rxTest.test(query)) {

if (!this.parentNode) {
// Add to temporary container
container.appendChild(this);
gaveContainer = true;
}

if (this.parentNode instanceof DocumentFragment) {
frag = this.parentNode;
while (frag.firstChild) container.appendChild(frag.firstChild);
parentIsFragment = true;
}

parentNode = this.parentNode;

if (!this.id) {
Expand All @@ -45,16 +51,22 @@
gaveId = true;
}

// replace :scope with ID selector
idSelector = '#' + this.id + ' ';
query = query.replace(rxStart, idSelector).replace(rxOthers, ', ' + idSelector);

// Find elements against parent node
nodeList = oldMethod.call(parentNode, '#'+this.id+' '+query);
nodeList = oldMethod.call(parentNode, query);

// Reset the ID
if (gaveId) {
this.id = '';
}

// Remove from temporary container
if (gaveContainer) {
if (parentIsFragment) {
while (container.firstChild) frag.appendChild(container.firstChild);
} else if (gaveContainer) {
container.removeChild(this);
}

Expand All @@ -71,4 +83,4 @@
overrideNodeMethod(HTMLElement.prototype, 'querySelector');
overrideNodeMethod(HTMLElement.prototype, 'querySelectorAll');
}
}());
}());
83 changes: 72 additions & 11 deletions test/testShim.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,44 @@ describe('scopedQuerySelectorShim', function() {
return node;
}

function makeNodeAndAddToFragment(html) {
var frag, node;
frag = document.createDocumentFragment();
node = makeNode(html);
frag.appendChild(node);
return node;
}

function testChildNode(node) {
expect(node.innerHTML).to.equal('Child');
expect(node.innerHTML).toBe('Child');
}

function testChildNodeList(nodeList) {
expect(nodeList.length).to.equal(1);
expect(nodeList.length).toBe(1);
testChildNode(nodeList[0]);
}

function testComplexNodeList(nodeList) {
testGrandChildNode(nodeList[0]);
testGrandChildNode1(nodeList[1]);
testGrandChildNode2(nodeList[2]);
testGrandChildNode3(nodeList[3]);
}

function testGrandChildNode(node) {
expect(node.innerHTML).to.equal('Grandchild 1');
expect(node.innerHTML).toBe('Grandchild 1');
}

function testGrandChildNode1(node) {
expect(node.innerHTML).to.equal('Grandchild 2');
expect(node.innerHTML).toBe('Grandchild 2');
}

function testGrandChildNode2(node) {
expect(node.innerHTML).toBe('Grandchild 3');
}

function testGrandChildNode3(node) {
expect(node.innerHTML).toBe('Grandchild 4');
}

function testGrandChildNodeList(nodeList) {
Expand All @@ -45,7 +68,7 @@ describe('scopedQuerySelectorShim', function() {
<div>\
<header>Grandchild</header>\
</div>\
</div>';
<div>';

var listHTML = '<div>\
<ul>\
Expand All @@ -54,6 +77,17 @@ describe('scopedQuerySelectorShim', function() {
</ul>\
</div>';

var complexHTML = '<div>\
<ul>\
<li>Grandchild 1</li>\
<li>Grandchild 2</li>\
</ul>\
<ol>\
<li>Grandchild 3</li>\
<li>Grandchild 4</li>\
</ol>\
</div>';

describe('when nodes are in the DOM', function() {
it('should find child nodes', function() {
testChildNode(makeNodeAndAddToDOM(childHTML).querySelector(':scope > header'));
Expand All @@ -64,6 +98,11 @@ describe('scopedQuerySelectorShim', function() {
testGrandChildNode(makeNodeAndAddToDOM(listHTML).querySelector(':scope > ul > li'));
testGrandChildNodeList(makeNodeAndAddToDOM(listHTML).querySelectorAll(':scope > ul > li'));
});

it('should handle complex queries', function() {
testGrandChildNode(makeNodeAndAddToDOM(complexHTML).querySelector(':scope > ul > li, :scope > ol > li'));
testComplexNodeList(makeNodeAndAddToDOM(complexHTML).querySelectorAll(':scope > ul > li, :scope > ol > li'));
});
});

describe('when nodes are not in the DOM', function() {
Expand All @@ -76,30 +115,52 @@ describe('scopedQuerySelectorShim', function() {
testGrandChildNode(makeNode(listHTML).querySelector(':scope > ul > li'));
testGrandChildNodeList(makeNode(listHTML).querySelectorAll(':scope > ul > li'));
});

it('should handle complex queries', function() {
testGrandChildNode(makeNode(complexHTML).querySelector(':scope > ul > li, :scope > ol > li'));
testComplexNodeList(makeNode(complexHTML).querySelectorAll(':scope > ul > li, :scope > ol > li'));
});
});

describe('when nodes are in a document fragment', function() {
it('should find child nodes', function() {
testChildNode(makeNodeAndAddToFragment(childHTML).querySelector(':scope > header'));
testChildNodeList(makeNodeAndAddToFragment(childHTML).querySelectorAll(':scope > header'));
});

it('should find grandchild nodes', function() {
testGrandChildNode(makeNodeAndAddToFragment(listHTML).querySelector(':scope > ul > li'));
testGrandChildNodeList(makeNodeAndAddToFragment(listHTML).querySelectorAll(':scope > ul > li'));
});

it('should handle complex queries', function() {
testGrandChildNode(makeNodeAndAddToFragment(complexHTML).querySelector(':scope > ul > li, :scope > ol > li'));
testComplexNodeList(makeNodeAndAddToFragment(complexHTML).querySelectorAll(':scope > ul > li, :scope > ol > li'));
});
});

describe('when temporary containers and IDs are used', function() {
it('should not leave nodes in temporary container', function() {
var node = makeNode(childHTML);
expect(node.parentNode).to.be.null;
expect(node.parentNode).toBe(null);
node.querySelectorAll(':scope > header');
expect(node.parentNode).to.be.null;
expect(node.parentNode).toBe(null);
});

it('should not leave temporary IDs', function() {
var node = makeNode(childHTML);
expect(node.id).to.equal('');
expect(node.id).toBe('');
node.querySelectorAll(':scope > header');
expect(node.id).to.equal('');
expect(node.id).toBe('');
});
});

describe('when nodes have IDs', function() {
it('should not overwrite existing IDs', function() {
var node = makeNode(idHTML);
expect(node.id).to.equal('myDiv');
expect(node.id).toBe('myDiv');
node.querySelectorAll(':scope > header');
expect(node.id).to.equal('myDiv');
expect(node.id).toBe('myDiv');
});
});
});