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

Fix :colo.

Browse Source
This commit is contained in:
Kris Maglione
2011-01-04 00:04:21 -05:00
parent 20b34f607d
commit 361fa347b9
2 changed files with 41 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/modules/highlight.jsm
View File

@@ -282,7 +282,7 @@ var Highlights = Module("Highlight", {
if (scheme == "default")
highlight.clear();
else
dactyl.assert(io.sourceFromRuntimePath(["colors/" + scheme + "." + config.fileExtension]),
dactyl.assert(modules.io.sourceFromRuntimePath(["colors/" + scheme + "." + config.fileExtension]),
"E185: Cannot find color scheme " + scheme);
autocommands.trigger("ColorScheme", { name: scheme });
},

73
common/modules/overlay.jsm
View File

@@ -145,40 +145,42 @@ var Overlay = Module("Overlay", {
let prefix = [BASE];
["base",
"completion",
"config",
"javascript",
"overlay",
"prefs",
"services",
"storage",
"util"
].forEach(function (name) require(jsmodules, name));
prefix.unshift("chrome://" + config.name + "/content/");
defineModule.time("load", null, function _load() {
["base",
"completion",
"config",
"javascript",
"overlay",
"prefs",
"services",
"storage",
"util"
].forEach(function (name) require(jsmodules, name));
prefix.unshift("chrome://" + config.name + "/content/");
["dactyl",
"modes",
"abbreviations",
"autocommands",
"buffer",
"commandline",
"commands",
"editor",
"events",
"finder",
"highlight",
"hints",
"io",
"mappings",
"marks",
"options",
"statusline",
"styles",
"template"
].forEach(modules.load);
["dactyl",
"modes",
"abbreviations",
"autocommands",
"buffer",
"commandline",
"commands",
"editor",
"events",
"finder",
"highlight",
"hints",
"io",
"mappings",
"marks",
"options",
"statusline",
"styles",
"template"
].forEach(modules.load);
config.scripts.forEach(modules.load);
config.scripts.forEach(modules.load);
}, this);
},
load: function (document) {
var { modules, Module } = window.dactyl.modules;
@@ -194,7 +196,7 @@ var Overlay = Module("Overlay", {
const start = Date.now();
const deferredInit = { load: [] };
const seen = set();
const loaded = set(["init"]);
const loaded = set();
modules.loaded = loaded;
function init(module) {
@@ -249,6 +251,11 @@ var Overlay = Module("Overlay", {
return modules[module.className];
}
for each (let module in defineModule.modules)
defineModule.time(module.constructor.className, "init",
module.INIT.init, module,
modules.dactyl, modules, window);
defineModule.modules.map(init);
Module.list.forEach(load);