1
0
Fork 0
mirror of https://github.com/kkapsner/CanvasBlocker synced 2025-07-04 20:46:39 +02:00

Switch from frameScript to require("sdk/remote/...").

Fixes #98. Fixes #100.
This commit is contained in:
kkapsner 2017-01-31 21:31:55 +01:00
parent c0c16b6546
commit 602d5a6bfd
3 changed files with 74 additions and 142 deletions

View file

@ -8,13 +8,11 @@
const {when: unload} = require("sdk/system/unload");
const {check, checkStack} = require("./check.js");
const {notify} = require("./notifications");
const _ = require("sdk/l10n").get;
const lists = require("./lists");
const preferences = require("sdk/simple-prefs");
const prefService = require("sdk/preferences/service");
const prefs = preferences.prefs;
const notificationPref = {
@ -30,57 +28,17 @@
}
};
const {Cc, Ci} = require("chrome");
var globalMM = Cc["@mozilla.org/globalmessagemanager;1"].getService(Ci.nsIMessageListenerManager);
var frameURL = require("sdk/self").data.url("frame.js?" + Math.random());
globalMM.loadFrameScript(frameURL, true);
const {processes, frames, remoteRequire} = require("sdk/remote/parent");
remoteRequire("./frame.js", module);
var listeners = [];
function addMessageListener(name, func){
listeners.push({name, func});
globalMM.addMessageListener(name, func);
}
frames.port.on("canvasBlocker-notify", function(frame, data){
notify(data, {lists, _, notificationPref, browser: frame.frameElement});
});
unload(function(){
globalMM.removeDelayedFrameScript(frameURL);
globalMM.broadcastAsyncMessage("canvasBlocker-unload");
listeners.forEach(function(listener){
globalMM.removeMessageListener(listener.name, listener.func);
});
});
// messages from the frame.js
addMessageListener("canvasBlocker-check", function(ev){
var status = check(ev.data);
return status;
});
addMessageListener("canvasBlocker-checkStack", function(ev){
return checkStack(ev.data);
});
addMessageListener("canvasBlocker-notify", function(ev){
var browser = ev.target;
notify(ev.data, {lists, _, notificationPref, browser});
});
addMessageListener("canvasBlocker-pref-get", function(ev){
return prefs[ev.data];
});
addMessageListener("canvasBlocker-pref-set", function(ev){
prefs[ev.data.name] = ev.data.value;
prefService.set("extensions.CanvasBlocker@kkapsner.de." + ev.data.name, ev.data.value);
});
addMessageListener("canvasBlocker-list-match", function(ev){
return lists.get(ev.data.list).match(ev.data.url);
});
addMessageListener("canvasBlocker-list-appendTo", function(ev){
return lists.appendTo(ev.data.list, ev.data.entry);
});
addMessageListener("canvasBlocker-translate", function(ev){
return _(ev.data);
processes.port.emit("canvasBlocker-unload");
});
// show release notes
var data = require("sdk/self").data;
preferences.on("showReleaseNotes", function(){
var url = data.url("releaseNotes.txt").replace("/data/", "/");