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

Fix startup on FF36.

Browse Source
This commit is contained in:
Kris Maglione
2011-02-04 12:27:24 -05:00
parent 0f796e823b
commit e514899d23
3 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
common/components/protocols.js
View File

@@ -3,7 +3,6 @@
// This work is licensed for reuse under an MIT license. Details are // This work is licensed for reuse under an MIT license. Details are
// given in the LICENSE.txt file included with this file. // given in the LICENSE.txt file included with this file.
"use strict"; "use strict";
function reportError(e) { function reportError(e) {
dump("dactyl: protocols: " + e + "\n" + (e.stack || Error().stack)); dump("dactyl: protocols: " + e + "\n" + (e.stack || Error().stack));
Cu.reportError(e); Cu.reportError(e);
@@ -61,12 +60,18 @@ function redirect(to, orig, time) {
function Factory(clas) ({ function Factory(clas) ({
__proto__: clas.prototype, __proto__: clas.prototype,
createInstance: function (outer, iid) { createInstance: function (outer, iid) {
try {
if (outer != null) if (outer != null)
throw Components.results.NS_ERROR_NO_AGGREGATION; throw Components.results.NS_ERROR_NO_AGGREGATION;
if (!clas.instance) if (!clas.instance)
clas.instance = new clas(); clas.instance = new clas();
return clas.instance.QueryInterface(iid); return clas.instance.QueryInterface(iid);
} }
catch (e) {
reportError(e);
throw e;
}
}
}); });
function ChromeData() {} function ChromeData() {}

2
common/modules/config.jsm
View File

@@ -728,8 +728,6 @@ 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:

2
common/modules/overlay.jsm
View File

@@ -30,6 +30,8 @@ var Overlay = Module("Overlay", {
init: function () { init: function () {
services["dactyl:"]; // Hack. Force module initialization. services["dactyl:"]; // Hack. Force module initialization.
config.loadStyles();
util.overlayWindow(config.overlayChrome, function (window) ({ util.overlayWindow(config.overlayChrome, function (window) ({
init: function (document) { init: function (document) {
/** /**