security-and-privacy/CanvasBlocker
security-and-privacy/CanvasBlocker
1
0
Fork 0
mirror of https://github.com/kkapsner/CanvasBlocker synced 2025-05-19 19:02:21 +02:00
Code Releases Activity

Settings only need to be loaded when still in default state.

Browse Source
This commit is contained in:
kkapsner 2017-09-23 23:40:57 +02:00
parent a4a92fc2f9
commit 2b1a32e078
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lib/frame.js
View File

@ -75,9 +75,8 @@
port.postMessage({"canvasBlocker-notify": data}); port.postMessage({"canvasBlocker-notify": data});
} }
const preferences = require("sdk/simple-prefs");
function prefs(name){ function prefs(name){
return preferences.prefs[name]; return settings[name];
} }
@ -93,7 +92,7 @@
catch (e){ catch (e){
// we are unable to read the location due to SOP // we are unable to read the location due to SOP
// therefore we also can not intercept anything. // therefore we also can not intercept anything.
warning("NOT intercepting window du to SOP", window); warning("NOT intercepting window due to SOP", window);
return false; return false;
} }
@ -139,7 +138,25 @@
return true; return true;
}; };
if (settings.isStillDefault){
message("load settings");
browser.storage.local.get().then(function(data){
Object.keys(data).forEach(function(key){
notice("loaded setting:", key, ":", data[key]);
settings[key] = data[key];
var match = key.match(/^(.+)list$/i);
if (match){
lists.update(match[1]);
}
});
settings.isStillDefault = false;
logging.clearQueue();
interceptWindow(window); interceptWindow(window);
});
}
else {
interceptWindow(window);
}
message("register listener for messages from background script"); message("register listener for messages from background script");
browser.runtime.onMessage.addListener(function(data){ browser.runtime.onMessage.addListener(function(data){
@ -156,13 +173,6 @@
} }
}); });
message("load settings");
browser.storage.local.get().then(function(data){
Object.keys(data).forEach(function(key){
notice("loaded setting:", key, ":", data[key]);
settings[key] = data[key];
});
});
message("register listener for settings changes"); message("register listener for settings changes");
browser.storage.onChanged.addListener(function(change, area){ browser.storage.onChanged.addListener(function(change, area){