Annotation-Pushers
/
Annotation-System
1
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

hmml_to_html.c: Fix dot colouring [#3] 

This additionally fixes the lightness stuff on Chrome
This commit is contained in:
Matt Mascarenhas 2017-06-10 16:56:04 +01:00
parent a38ca2fd9e
commit 2f5057f36b
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hmml_to_html/player.js
View File

@ -811,6 +811,7 @@ function filterItemToggle(filterItem) {
if(filterState[selectedCategory].off) if(filterState[selectedCategory].off)
{ {
filterItem.classList.add("off"); filterItem.classList.add("off");
filterItem.querySelector(".icon").style.backgroundColor = "transparent";
var testMarkers = document.querySelectorAll(".marker." + selectedCategory + ", .marker.cat_" + selectedCategory); var testMarkers = document.querySelectorAll(".marker." + selectedCategory + ", .marker.cat_" + selectedCategory);
for(var j = 0; j < testMarkers.length; ++j) for(var j = 0; j < testMarkers.length; ++j)
{ {
@ -824,6 +825,7 @@ function filterItemToggle(filterItem) {
if(markerCategories[k].classList.contains(selectedCategory)) if(markerCategories[k].classList.contains(selectedCategory))
{ {
markerCategories[k].classList.add("off"); markerCategories[k].classList.add("off");
markerCategories[k].style.backgroundColor = "transparent";
} }
} }
} }
@ -859,6 +861,8 @@ function filterItemToggle(filterItem) {
else else
{ {
filterItem.classList.remove("off"); filterItem.classList.remove("off");
filterItem.querySelector(".icon").style.backgroundColor = getComputedStyle(filterItem.querySelector(".icon")).getPropertyValue("border-color");
setDotLightness(filterItem.querySelector(".icon"));
var testMarkers = document.querySelectorAll(".marker.off_" + selectedCategory); var testMarkers = document.querySelectorAll(".marker.off_" + selectedCategory);
for(var j = 0; j < testMarkers.length; ++j) for(var j = 0; j < testMarkers.length; ++j)
{ {
@ -872,6 +876,8 @@ function filterItemToggle(filterItem) {
if(markerCategories[k].classList.contains(selectedCategory)) if(markerCategories[k].classList.contains(selectedCategory))
{ {
markerCategories[k].classList.remove("off"); markerCategories[k].classList.remove("off");
markerCategories[k].style.backgroundColor = getComputedStyle(markerCategories[k]).getPropertyValue("border-color");
setDotLightness(markerCategories[k]);
} }
} }
} }
@ -1138,16 +1144,17 @@ function RGBtoHSL(colour)
function getBackgroundBrightness(element) { function getBackgroundBrightness(element) {
var colour = getComputedStyle(element).getPropertyValue("background-color"); var colour = getComputedStyle(element).getPropertyValue("background-color");
var depth = 0; var depth = 0;
while(colour == "transparent" && depth <= 4) while((colour == "transparent" || colour == "rgba(0, 0, 0, 0)") && depth <= 4)
{ {
element = element.parentNode; element = element.parentNode;
colour = getComputedStyle(element).getPropertyValue("background-color"); colour = getComputedStyle(element).getPropertyValue("background-color");
++depth; ++depth;
} }
var rgb = colour.slice(4, -1).split(", "); var rgb = colour.slice(4, -1).split(", ");
return Math.sqrt(rgb[0] * rgb[0] * .241 + var result = Math.sqrt(rgb[0] * rgb[0] * .241 +
rgb[1] * rgb[1] * .691 + rgb[1] * rgb[1] * .691 +
rgb[2] * rgb[2] * .068); rgb[2] * rgb[2] * .068);
return result;
} }
function setTextLightness(textElement) function setTextLightness(textElement)