1
0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-02-16 12:05:47 +01:00

Merge addon-common module loading code to fix Minefield.

--HG--
extra : rebase_source : 6b5f0dc0a575a6d21892e18cbb56ab0230382356
This commit is contained in:
Kris Maglione
2012-05-07 17:01:21 -04:00
parent 461b26c603
commit 43f3295127
33 changed files with 415 additions and 543 deletions

View File

@@ -7,11 +7,13 @@
try {
Components.utils.import("resource://dactyl/bootstrap.jsm");
defineModule("addons", {
exports: ["AddonManager", "Addons", "Addon", "addons"],
require: ["services"]
}, this);
require: ["services", "util"]
});
this.lazyRequire("completion", ["completion"]);
lazyRequire("template", ["template"]);
var callResult = function callResult(method) {
let args = Array.slice(arguments, 1);
@@ -496,7 +498,7 @@ var Addons = Module("addons", {
});
if (!services.has("extensionManager"))
Components.utils.import("resource://gre/modules/AddonManager.jsm");
Components.utils.import("resource://gre/modules/AddonManager.jsm", this);
else
var AddonManager = {
PERM_CAN_UNINSTALL: 1,