gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-03-01 23:25:46 +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") if (scheme == "default")
highlight.clear(); highlight.clear();
else else
dactyl.assert(io.sourceFromRuntimePath(["colors/" + scheme + "." + config.fileExtension]), dactyl.assert(modules.io.sourceFromRuntimePath(["colors/" + scheme + "." + config.fileExtension]),
"E185: Cannot find color scheme " + scheme); "E185: Cannot find color scheme " + scheme);
autocommands.trigger("ColorScheme", { name: scheme }); autocommands.trigger("ColorScheme", { name: scheme });
}, },

73
common/modules/overlay.jsm
View File

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