summaryrefslogtreecommitdiff
path: root/data/extensions/jid1-KtlZuoiikVfFew@jetpack/resources/librejs/lib/addon_management/install_uninstall.js
diff options
context:
space:
mode:
Diffstat (limited to 'data/extensions/jid1-KtlZuoiikVfFew@jetpack/resources/librejs/lib/addon_management/install_uninstall.js')
-rw-r--r--data/extensions/jid1-KtlZuoiikVfFew@jetpack/resources/librejs/lib/addon_management/install_uninstall.js39
1 files changed, 19 insertions, 20 deletions
diff --git a/data/extensions/jid1-KtlZuoiikVfFew@jetpack/resources/librejs/lib/addon_management/install_uninstall.js b/data/extensions/jid1-KtlZuoiikVfFew@jetpack/resources/librejs/lib/addon_management/install_uninstall.js
index 6a4999d..c5c150f 100644
--- a/data/extensions/jid1-KtlZuoiikVfFew@jetpack/resources/librejs/lib/addon_management/install_uninstall.js
+++ b/data/extensions/jid1-KtlZuoiikVfFew@jetpack/resources/librejs/lib/addon_management/install_uninstall.js
@@ -2,20 +2,22 @@
* GNU LibreJS - A browser add-on to block nonfree nontrivial JavaScript.
* *
* Copyright (C) 2011, 2012, 2013, 2014 Loic J. Duros
+ * Copyright (C) 2014, 2015 Nik Nyby
*
- * This program is free software: you can redistribute it and/or modify
+ * This file is part of GNU LibreJS.
+ *
+ * GNU LibreJS is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
+ * GNU LibreJS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ * along with GNU LibreJS. If not, see <http://www.gnu.org/licenses/>.
*/
/**
@@ -26,9 +28,8 @@
const {Cc, Ci, Cu, Cm, Cr} = require("chrome");
const httpObserver = require("http_observer/http_request_observer");
-
-const narcissusWorker = require("narcissus_parser/narcissus_worker");
-
+var narcissusWorker = require("parser/narcissus_worker")
+ .narcissusWorker;
const caching = require("http_observer/caching");
const prompt = Cc["@mozilla.org/embedcomp/prompt-service;1"].
@@ -38,21 +39,19 @@ const prompt = Cc["@mozilla.org/embedcomp/prompt-service;1"].
const tabs = require('sdk/tabs');
/**
- * Stop the httpObserver when the add-on
- * is disabled or removed.
+ * Stop the httpObserver when the add-on is disabled or removed.
*/
exports.onUnload = function(reason) {
-
- if (reason == "disable" ||
- reason == "shutdown" ||
- reason == "upgrade" ||
- reason == "downgrade") {
- require("settings/storage").librejsStorage.writeCacheToDB();
- // remove all http notifications
- httpObserver.removeHttpObserver();
- // remove worker.
- narcissusWorker.stopWorker();
- }
+ if (reason == "disable" ||
+ reason == "shutdown" ||
+ reason == "upgrade" ||
+ reason == "downgrade") {
+ require("settings/storage").librejsStorage.writeCacheToDB();
+ // remove all http notifications
+ httpObserver.removeHttpObserver();
+ // remove worker.
+ narcissusWorker.stopWorker();
+ }
};