jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix blacklist code executing muliple times

Browse Source 
- When enabling/disabling all, it was executing on every single blacklist line
- When starting out disabled, it was executing several times
This commit is contained in:
BrokenEagle
2020-03-07 01:06:52 +00:00
parent d84150b232
commit d1aed303fd
1 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
app/javascript/src/javascripts/blacklists.js
View File

@@ -84,28 +84,44 @@ Blacklist.update_sidebar = function() {
$("#blacklist-box").show(); $("#blacklist-box").show();
} }
Blacklist.disable_all = function() {
Blacklist.entries.forEach(function(entry) {
entry.disabled = true;
});
// There is no need to process the blacklist when disabling
Blacklist.posts().removeClass("blacklisted-active");
$("#disable-all-blacklists").hide();
$("#re-enable-all-blacklists").show();
$("#blacklist-list a").addClass("blacklisted-inactive");
}
Blacklist.enable_all = function() {
Blacklist.entries.forEach(function(entry) {
entry.disabled = false;
});
Blacklist.apply();
$("#disable-all-blacklists").show();
$("#re-enable-all-blacklists").hide();
$("#blacklist-list a").removeClass("blacklisted-inactive");
}
Blacklist.initialize_disable_all_blacklists = function() { Blacklist.initialize_disable_all_blacklists = function() {
if (Cookie.get("dab") === "1") { if (Cookie.get("dab") === "1") {
$("#re-enable-all-blacklists").show(); Blacklist.disable_all();
$("#blacklist-list a:not(.blacklisted-active)").click();
Blacklist.apply();
} else { } else {
// The blacklist has already been processed by this point
$("#disable-all-blacklists").show() $("#disable-all-blacklists").show()
} }
$("#disable-all-blacklists").on("click.danbooru", function(e) { $("#disable-all-blacklists").on("click.danbooru", function(e) {
$("#disable-all-blacklists").hide();
$("#re-enable-all-blacklists").show();
Cookie.put("dab", "1"); Cookie.put("dab", "1");
$("#blacklist-list a:not(.blacklisted-active)").click(); Blacklist.disable_all();
e.preventDefault(); e.preventDefault();
}); });
$("#re-enable-all-blacklists").on("click.danbooru", function(e) { $("#re-enable-all-blacklists").on("click.danbooru", function(e) {
$("#disable-all-blacklists").show();
$("#re-enable-all-blacklists").hide();
Cookie.put("dab", "0"); Cookie.put("dab", "0");
$("#blacklist-list a.blacklisted-active").click(); Blacklist.enable_all();
e.preventDefault(); e.preventDefault();
}); });
} }