1
0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2025-12-22 23:58:00 +01:00

Decomplicate stuff.

This commit is contained in:
Kris Maglione
2014-02-19 01:04:26 -08:00
parent 7af27cd15b
commit 4b985eb8f2

11
common/bootstrap.js vendored
View File

@@ -57,9 +57,7 @@ let addonData = null;
let basePath = null; let basePath = null;
let bootstrap; let bootstrap;
let bootstrap_jsm; let bootstrap_jsm;
let categories = [];
let components = {}; let components = {};
let resources = [];
let getURI = null; let getURI = null;
let JSMLoader = { let JSMLoader = {
@@ -228,15 +226,12 @@ function init() {
manifest.categories.push([category, id, contract]); manifest.categories.push([category, id, contract]);
} }
for (let [category, id, value] of manifest.categories) { for (let [category, id, value] of manifest.categories)
categoryManager.addCategoryEntry(category, id, value, categoryManager.addCategoryEntry(category, id, value,
false, true); false, true);
categories.push([category, id]);
}
for (let [pkg, path] in Iterator(manifest.resources || {})) { for (let [pkg, path] in Iterator(manifest.resources || {})) {
moduleName = moduleName || pkg; moduleName = moduleName || pkg;
resources.push(pkg);
resourceProto.setSubstitution(pkg, getURI(path)); resourceProto.setSubstitution(pkg, getURI(path));
} }
@@ -416,9 +411,9 @@ function shutdown(data, reason) {
bootstrap = null; bootstrap = null;
bootstrap_jsm = null; bootstrap_jsm = null;
for each (let [category, entry] in categories) for each (let [category, entry] in JSMLoader.config.categories)
categoryManager.deleteCategoryEntry(category, entry, false); categoryManager.deleteCategoryEntry(category, entry, false);
for each (let resource in resources) for (let resource in JSMLoader.config.resources)
resourceProto.setSubstitution(resource, null); resourceProto.setSubstitution(resource, null);
} }
} }