mock_filter.html: Tighten the filter loop [#21]

This commit is contained in:
Matt Mascarenhas 2017-05-17 21:25:27 +01:00
parent bd7baf9e5d
commit 352ba4739f
1 changed files with 28 additions and 36 deletions

View File

@ -287,26 +287,24 @@ for(var i = 0; i < filterTopics.length; ++i)
{ {
this.classList.add("off"); this.classList.add("off");
for(var j = 0; j < testMarkers.length; ++j) for(var j = 0; j < testMarkers.length; ++j)
{
var categorisedMarkers = testMarkers[j].querySelectorAll("." + selectedCategory);
for(var k = 0; k < categorisedMarkers.length; ++k)
{ {
var Skipping = 1; var Skipping = 1;
categorisedMarkers[k].classList.add("off"); var markerCategories = testMarkers[j].querySelectorAll(".category");
for(var k = 0; k < markerCategories.length; ++k)
{
if(markerCategories[k].classList.contains(selectedCategory))
{
markerCategories[k].classList.add("off");
}
if(filterMode == "exclusive") if(filterMode == "exclusive")
{ {
testMarkers[j].classList.add("skip"); testMarkers[j].classList.add("skip");
} }
else else if(!markerCategories[k].classList.contains("off"))
{
var markerCategories = testMarkers[j].querySelectorAll(".category");
for(var l = 0; l < markerCategories.length; ++l)
{
if(!markerCategories[l].classList.contains("off"))
{ {
Skipping = 0; Skipping = 0;
} }
} }
if(Skipping) if(Skipping)
{ {
@ -314,32 +312,28 @@ for(var i = 0; i < filterTopics.length; ++i)
} }
} }
} }
}
}
else else
{ {
this.classList.remove("off"); this.classList.remove("off");
for(var j = 0; j < testMarkers.length; ++j) for(var j = 0; j < testMarkers.length; ++j)
{
var categorisedMarkers = testMarkers[j].querySelectorAll("." + selectedCategory);
for(var k = 0; k < categorisedMarkers.length; ++k)
{ {
var Skipping = 0; var Skipping = 0;
categorisedMarkers[k].classList.remove("off"); var markerCategories = testMarkers[j].querySelectorAll(".category");
for(var k = 0; k < markerCategories.length; ++k)
{
if(markerCategories[k].classList.contains(selectedCategory))
{
markerCategories[k].classList.remove("off");
}
if(filterMode == "inclusive") if(filterMode == "inclusive")
{ {
testMarkers[j].classList.remove("skip"); testMarkers[j].classList.remove("skip");
} }
else else if(markerCategories[k].classList.contains("off"))
{
var markerCategories = testMarkers[j].querySelectorAll(".category");
for(var l = 0; l < markerCategories.length; ++l)
{
if(markerCategories[l].classList.contains("off"))
{ {
Skipping = 1; Skipping = 1;
} }
} }
if(!Skipping) if(!Skipping)
{ {
@ -347,8 +341,6 @@ for(var i = 0; i < filterTopics.length; ++i)
} }
} }
} }
}
}
}); });
} }