gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-02-16 07:15:46 +01:00
Code Issues Projects Releases Wiki Activity

Merge addon-common module loading code to fix Minefield.

Browse Source 
--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
Download Patch File Download Diff File Expand all files Collapse all files

9
common/modules/main.jsm
View File

@@ -6,11 +6,10 @@
try {
Components.utils.import("resource://dactyl/bootstrap.jsm");
defineModule("main", {
exports: ["ModuleBase"],
require: ["config", "overlay", "services", "util"]
}, this);
});
var BASE = "resource://dactyl-content/";
@@ -130,7 +129,7 @@ var Modules = function Modules(window) {
}
}
try {
require(jsmodules, script);
require(script, jsmodules);
}
catch (e) {
util.dump("Loading script " + script + ":");
@@ -150,7 +149,7 @@ var Modules = function Modules(window) {
wantXrays: false });
// Hack:
sandbox.Object = jsmodules.Object;
// sandbox.Object = jsmodules.Object;
sandbox.File = jsmodules.File;
sandbox.Math = jsmodules.Math;
sandbox.__proto__ = proto || modules;
@@ -181,7 +180,7 @@ overlay.overlayWindow(Object.keys(config.overlays), function _overlay(window) ({
defineModule.time("load", null, function _load() {
config.modules.global
.forEach(function (name) defineModule.time("load", name, require, null, modules.jsmodules, name));
.forEach(function (name) defineModule.time("load", name, require, null, name, modules.jsmodules));
config.modules.window
.forEach(function (name) defineModule.time("load", name, modules.load, modules, name));