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

Fix some startup issues.

Browse Source
This commit is contained in:
Kris Maglione
2011-02-02 11:58:03 -05:00
parent bc342751da
commit bbe245a7bd
1 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/modules/config.jsm
+19 -16
View File
@@ -12,8 +12,8 @@ let global = this;
Components.utils.import("resource://dactyl/bootstrap.jsm"); Components.utils.import("resource://dactyl/bootstrap.jsm");
defineModule("config", { defineModule("config", {
exports: ["ConfigBase", "Config", "config"], exports: ["ConfigBase", "Config", "config"],
require: ["highlight", "services", "storage", "util", "template"], require: ["services", "storage", "util", "template"],
use: ["highlight", "io"] use: ["io"]
}, this); }, this);
var ConfigBase = Class("ConfigBase", { var ConfigBase = Class("ConfigBase", {
@@ -22,8 +22,22 @@ var ConfigBase = Class("ConfigBase", {
* initialization code. Must call superclass's init function. * initialization code. Must call superclass's init function.
*/ */
init: function init() { init: function init() {
this.features.push = deprecated("set.add", function push(feature) set.add(this, feature));
if (util.haveGecko("2b"))
set.add(this.features, "Gecko2");
this.timeout(function () { this.timeout(function () {
services["dactyl:"].pages.dtd = function () [null,
iter(config.dtdExtra,
(["dactyl." + k, v] for ([k, v] in iter(config.dtd))),
(["dactyl." + s, config[s]] for each (s in config.dtdStrings)))
.map(function ([k, v]) ["<!ENTITY ", k, " '", String.replace(v, /'/g, "&apos;"), "'>"].join(""))
.join("\n")]
});
},
loadStyles: function loadStyles() {
const { highlight } = require("highlight");
highlight.styleableChrome = this.styleableChrome; highlight.styleableChrome = this.styleableChrome;
highlight.loadCSS(this.CSS); highlight.loadCSS(this.CSS);
highlight.loadCSS(this.helpCSS); highlight.loadCSS(this.helpCSS);
@@ -37,20 +51,6 @@ var ConfigBase = Class("ConfigBase", {
text-shadow: black -1px 0 1px, black 0 1px 1px, black 1px 0 1px, black 0 -1px 1px; text-shadow: black -1px 0 1px, black 0 1px 1px, black 1px 0 1px, black 0 -1px 1px;
} }
]]>); ]]>);
});
this.features.push = deprecated("set.add", function push(feature) set.add(this, feature));
if (util.haveGecko("2b"))
set.add(this.features, "Gecko2");
this.timeout(function () {
services["dactyl:"].pages.dtd = function () [null,
iter(config.dtdExtra,
(["dactyl." + k, v] for ([k, v] in iter(config.dtd))),
(["dactyl." + s, config[s]] for each (s in config.dtdStrings)))
.map(function ([k, v]) ["<!ENTITY ", k, " '", String.replace(v, /'/g, "&apos;"), "'>"].join(""))
.join("\n")]
});
}, },
get addonID() this.name + "@dactyl.googlecode.com", get addonID() this.name + "@dactyl.googlecode.com",
@@ -169,6 +169,7 @@ var ConfigBase = Class("ConfigBase", {
], ],
styleHelp: function styleHelp() { styleHelp: function styleHelp() {
const { highlight } = require("highlight");
if (!this.helpStyled) if (!this.helpStyled)
for (let k in keys(highlight.loaded)) for (let k in keys(highlight.loaded))
if (/^(Help|StatusLine)|^(Boolean|Indicator|MoreMsg|Number|Logo|Key(word)?|String)$/.test(k)) if (/^(Help|StatusLine)|^(Boolean|Indicator|MoreMsg|Number|Logo|Key(word)?|String)$/.test(k))
@@ -726,6 +727,8 @@ config.INIT = update(Object.create(config.INIT), config.INIT, {
endModule(); endModule();
config.loadStyles();
} catch(e){ if (isString(e)) e = Error(e); dump(e.fileName+":"+e.lineNumber+": "+e+"\n" + e.stack); } } catch(e){ if (isString(e)) e = Error(e); dump(e.fileName+":"+e.lineNumber+": "+e+"\n" + e.stack); }
// vim: set fdm=marker sw=4 sts=4 et ft=javascript: // vim: set fdm=marker sw=4 sts=4 et ft=javascript: