achmizs/AlwaysKillSticky
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added support for comments in pattern lists

Browse Source
This commit is contained in:
Said Achmiz 2019-01-31 11:15:41 -05:00
parent a1aba3746e
commit 94d596d525
4 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
contentScript.js
View File

@ -15,7 +15,9 @@ function killStickyIfMatch(result) {
result.matchingPatterns.split("\n") : result.matchingPatterns.split("\n") :
[ ]); [ ]);
for (let pattern of matchingPatterns) { for (let pattern of matchingPatterns) {
if (pattern && location.href.match(new RegExp(pattern))) { if (pattern &&
!pattern.hasPrefix("#") &&
location.href.match(new RegExp(pattern))) {
shouldKillSticky = true; shouldKillSticky = true;
break; break;
} }
@ -24,7 +26,9 @@ function killStickyIfMatch(result) {
result.exclusionPatterns.split("\n") : result.exclusionPatterns.split("\n") :
[ ]; [ ];
for (let pattern of exclusionPatterns) { for (let pattern of exclusionPatterns) {
if (pattern && location.href.match(new RegExp(pattern))) { if (pattern &&
!pattern.hasPrefix("#") &&
location.href.match(new RegExp(pattern))) {
shouldKillSticky = false; shouldKillSticky = false;
break; break;
} }

12
functions.js
View File

@ -22,6 +22,14 @@ Element.prototype.removeActivateEvent = function() {
this.removeEventListener("keyup", ael); this.removeEventListener("keyup", ael);
} }
/***********/
/* UTILITY */
/***********/
String.prototype.hasPrefix = function (prefix) {
return (this.lastIndexOf(prefix, 0) === 0);
}
/***********/ /***********/
/* HELPERS */ /* HELPERS */
/***********/ /***********/
@ -35,7 +43,3 @@ function killSticky() {
} }
}); });
} }
String.prototype.hasPrefix = function (prefix) {
return (this.lastIndexOf(prefix, 0) === 0);
}

6
options.js
View File

@ -17,13 +17,13 @@ function toggleModeSelectorState(newMode) {
let checkbox = document.querySelector("input#whitelist-mode"); let checkbox = document.querySelector("input#whitelist-mode");
newMode = newMode || (container.classList.contains("whitelist") ? "blacklist" : "whitelist"); newMode = newMode || (container.classList.contains("whitelist") ? "blacklist" : "whitelist");
container.classList.toggle("whitelist", (newMode == "whitelist")); container.classList.toggle("whitelist", (newMode == "whitelist"));
checkbox.checked = (newMode == "whitelist"); checkbox.checked = (newMode == "whitelist");
container.querySelectorAll("span").forEach(span => { container.querySelectorAll("span").forEach(span => {
span.classList.toggle("disabled", false); span.classList.toggle("disabled", false);
}); });
document.querySelector(`.${newMode}-mode-label`).classList.toggle("disabled", true); document.querySelector(`.${newMode}-mode-label`).classList.toggle("disabled", true);
document.querySelector("div#matchingPatterns").classList.toggle("disabled", (newMode == "whitelist")); document.querySelector("div#matchingPatterns").classList.toggle("disabled", (newMode == "whitelist"));
document.querySelector("div#matchingPatterns textarea").disabled = (newMode == "whitelist"); document.querySelector("div#matchingPatterns textarea").disabled = (newMode == "whitelist");
} }

12
popup.js
View File

@ -5,7 +5,7 @@
/* Toggle the current state, as represented in the ASK object. (Nothing actually /* Toggle the current state, as represented in the ASK object. (Nothing actually
happens until the UI state is updated, killSticky() is called (if needed), happens until the UI state is updated, killSticky() is called (if needed),
and the new settings are saved in storage.) and the new settings are saved in storage.)
What “toggle the current state” actually means depends on the current mode. What “toggle the current state” actually means depends on the current mode.
[1] In blacklist mode, toggleState() does one of the following: [1] In blacklist mode, toggleState() does one of the following:
@ -15,7 +15,7 @@
exclusion patterns; or, exclusion patterns; or,
(b) (if stickies are being killed on the current page) removes all (b) (if stickies are being killed on the current page) removes all
applicable matching patterns. applicable matching patterns.
[2] In whitelist mode, toggleState() does one of the following: [2] In whitelist mode, toggleState() does one of the following:
(a) (if stickies are not being killed on the current page) removes all (a) (if stickies are not being killed on the current page) removes all
@ -69,13 +69,17 @@ function recalculatePatternEffects() {
ASK.pageMatched = false; ASK.pageMatched = false;
ASK.pageExcluded = false; ASK.pageExcluded = false;
for (let pattern of ASK.matchingPatterns) { for (let pattern of ASK.matchingPatterns) {
if (pattern && ASK.activeTabLocation.match(new RegExp(pattern))) { if (pattern &&
!pattern.hasPrefix("#") &&
ASK.activeTabLocation.match(new RegExp(pattern))) {
ASK.pageMatched = true; ASK.pageMatched = true;
break; break;
} }
} }
for (let pattern of ASK.exclusionPatterns) { for (let pattern of ASK.exclusionPatterns) {
if (pattern && ASK.activeTabLocation.match(new RegExp(pattern))) { if (pattern &&
!pattern.hasPrefix("#") &&
ASK.activeTabLocation.match(new RegExp(pattern))) {
ASK.pageExcluded = true; ASK.pageExcluded = true;
break; break;
} }