gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2025-12-21 00:17:59 +01:00
Code Issues Projects Releases Wiki Activity

Fix live update issue.

Browse Source
This commit is contained in:
Kris Maglione
2011-02-08 22:43:10 -05:00
parent 8aa02f6d7a
commit f904799f9d
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/bootstrap.js vendored
View File

@@ -175,11 +175,11 @@ function init() {
reportError(e); reportError(e);
} }
if (JSMLoader && JSMLoader.bump != 3) // Temporary hack if (JSMLoader && JSMLoader.bump !== 4) // Temporary hack
Services.scriptloader.loadSubScript("resource://dactyl" + suffix + "/bootstrap.jsm", Services.scriptloader.loadSubScript("resource://dactyl" + suffix + "/bootstrap.jsm",
Cu.import("resource://dactyl/bootstrap.jsm", global)); Cu.import("resource://dactyl/bootstrap.jsm", global));
if (!JSMLoader || JSMLoader.bump != 3) if (!JSMLoader || JSMLoader.bump !== 4)
Cu.import("resource://dactyl/bootstrap.jsm", global); Cu.import("resource://dactyl/bootstrap.jsm", global);
JSMLoader.load("resource://dactyl/bootstrap.jsm", global); JSMLoader.load("resource://dactyl/bootstrap.jsm", global);

6
common/modules/bootstrap.jsm
View File

@@ -14,9 +14,9 @@ var storage = Components.classes["@mozilla.org/fuel/application;1"]
var JSMLoader = storage.get("dactyl.JSMLoader", undefined); var JSMLoader = storage.get("dactyl.JSMLoader", undefined);
if (!JSMLoader || JSMLoader.bump != 3) if (!JSMLoader || JSMLoader.bump != 4)
JSMLoader = { JSMLoader = {
bump: 3, bump: 4,
builtin: Components.utils.Sandbox(this), builtin: Components.utils.Sandbox(this),
canonical: {}, canonical: {},
factories: [], factories: [],
@@ -33,7 +33,7 @@ if (!JSMLoader || JSMLoader.bump != 3)
this.storage.set("dactyl.JSMLoader", this); this.storage.set("dactyl.JSMLoader", this);
let base = JSMLoader.load("base.jsm", global); let base = this.load("base.jsm", global);
global.EXPORTED_SYMBOLS = base.EXPORTED_SYMBOLS; global.EXPORTED_SYMBOLS = base.EXPORTED_SYMBOLS;
global.JSMLoader = this; global.JSMLoader = this;
base.JSMLoader = this; base.JSMLoader = this;

2
common/modules/config.jsm
View File

@@ -728,6 +728,6 @@ config.INIT = update(Object.create(config.INIT), config.INIT, {
endModule(); endModule();
} catch(e){ if (isString(e)) e = Error(e); dump(e.fileName+":"+e.lineNumber+": "+e+"\n" + e.stack); } } catch(e){ if (typeof e === "string") 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: