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

Don't fight stuff for focus. Maybe closes #982.

Browse Source
This commit is contained in:
Kris Maglione
2014-03-13 21:03:22 -07:00
parent 244434bd64
commit cb11523659
4 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
common/modules/config.jsm
View File

@@ -53,10 +53,14 @@ var ConfigBase = Class("ConfigBase", {
this.loadConfig();
JSMLoader.registerFactory(JSMLoader.Factory(AboutHandler));
JSMLoader.registerFactory(JSMLoader.Factory(
Protocol("dactyl", "{9c8f2530-51c8-4d41-b356-319e0b155c44}",
"resource://dactyl-content/")));
util.trapErrors(() => {
JSMLoader.registerFactory(JSMLoader.Factory(AboutHandler));
});
util.withProperErrors(() => {
JSMLoader.registerFactory(JSMLoader.Factory(
Protocol("dactyl", "{9c8f2530-51c8-4d41-b356-319e0b155c44}",
"resource://dactyl-content/")));
});
this.protocolLoaded = true;
this.timeout(function () {

2
common/modules/util.jsm
View File

@@ -1174,8 +1174,6 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
util.trapErrors(module.cleanup, module, reason);
}
JSMLoader.cleanup();
if (!this.rehashing)
services.observer.addObserver(this, "dactyl-rehash", true);
},