From 1584fe44eb6ba3d6006207fccfef41bced92c6ca Mon Sep 17 00:00:00 2001 From: Les De Ridder Date: Thu, 5 May 2016 12:06:29 +0200 Subject: [PATCH] Add blacklist disabling option --- background.js | 22 ++++++++++++---------- options.html | 8 +++++++- options.js | 5 ++++- 3 files changed, 23 insertions(+), 12 deletions(-) diff --git a/background.js b/background.js index 77f2973..c333f06 100644 --- a/background.js +++ b/background.js @@ -35,13 +35,23 @@ chrome.pageAction.onClicked.addListener(function(tab) { var filename = betterUrl.substr(betterUrl.lastIndexOf("/")); filename = cleanExtension(filename); - chrome.storage.sync.get({url: '', tabbehaviour: '', copytoclipboard: false, replacebookmark: false}, function(config) { + chrome.storage.sync.get({url: '', tabbehaviour: '', copytoclipboard: false, replacebookmark: false, disableurlblacklist: false}, function(config) { if(config.url == '') { alert("Please select a Pomf clone."); chrome.tabs.create({ url: "options.html" }); return; } + var blackList = ["pomf.", "mixtape.moe", "catgirlsare.sexy", "cocaine.ninja"]; + + if(!config.disableblacklist) { + for(black of blackList) { + if(url.indexOf(black) != -1) { + return; + } + } + } + var worker = new Worker('worker.js'); worker.onmessage = function(event) { var response = JSON.parse(event.data); @@ -109,17 +119,9 @@ function isCoolUrl(url) { var extensionIndex = url.lastIndexOf('.'); var extension = cleanExtension(url.substr(extensionIndex + 1)); - + var validExtensions = ["jpg", "jpeg", "png", "gif", "webm", "gifv", "mp4", "mp3", "ogg", "opus"]; - var blackList = ["pomf.", "mixtape.moe", "catgirlsare.sexy", "cocaine.ninja"]; - - for(black of blackList) { - if(url.indexOf(black) != -1) { - return false; - } - } - return validExtensions.indexOf(extension) != -1; } diff --git a/options.html b/options.html index 67f91a3..c62ac3d 100644 --- a/options.html +++ b/options.html @@ -39,11 +39,17 @@

+ Disable URL blacklist
+ +
+
+