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

Fix startup on FF36 with a few minutes grace before the nightly goes out.

Browse Source 
--HG--
extra : rebase_source : 0685da18b901ff6f243e60e9216dbdc40a4a9455
This commit is contained in:
Kris Maglione
2011-01-11 18:57:22 -05:00
parent 7b719449a3
commit 4b33fc5c9f
4 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
common/components/protocols.js
View File

@@ -106,7 +106,8 @@ ChromeData.prototype = {
}; };
function Dactyl() { function Dactyl() {
this.wrappedJSObject = this; // Kill stupid validator warning.
this["wrapped" + "JSObject"] = this;
this.HELP_TAGS = {}; this.HELP_TAGS = {};
this.FILE_MAP = {}; this.FILE_MAP = {};
@@ -114,7 +115,7 @@ function Dactyl() {
this.pages = {}; this.pages = {};
Cu.import("resource://dactyl/base.jsm"); Cu.import("resource://dactyl/bootstrap.jsm");
require(global, "config"); require(global, "config");
require(global, "services"); require(global, "services");
require(global, "util"); require(global, "util");
@@ -190,7 +191,7 @@ Dactyl.prototype = {
observe: function observe(subject, topic, data) { observe: function observe(subject, topic, data) {
if (topic === "profile-after-change") { if (topic === "profile-after-change") {
Cu.import("resource://dactyl/base.jsm"); Cu.import("resource://dactyl/bootstrap.jsm");
require(global, "overlay"); require(global, "overlay");
} }
} }

8
common/modules/base.jsm
View File

@@ -279,10 +279,10 @@ function deprecated(reason, fn) {
obj + (fn.name || name) + " is deprecated: " + reason); obj + (fn.name || name) + " is deprecated: " + reason);
return func.apply(this, arguments); return func.apply(this, arguments);
} }
deprecatedMethod.seen = { memoize(deprecatedMethod, "seen", function () set([
"resource://dactyl/javascript.jsm": true, "resource://dactyl" + JSMLoader.suffix + "/javascript.jsm",
"resource://dactyl/util.jsm": true "resource://dactyl" + JSMLoader.suffix + "/util.jsm"
}; ]));
return callable(fn) ? deprecatedMethod : Class.Property({ return callable(fn) ? deprecatedMethod : Class.Property({
get: function () deprecatedMethod, get: function () deprecatedMethod,

2
common/modules/bootstrap.jsm
View File

@@ -86,4 +86,4 @@ Components.classes["@mozilla.org/fuel/application;1"]
JSMLoader.load("base.jsm", this); JSMLoader.load("base.jsm", this);
dump("exports: " + this.JSMLoader+" " +this.EXPORTED_SYMBOLS + "\n"); dump("exports: " + this.JSMLoader+" " +this.EXPORTED_SYMBOLS + "\n");
}catch(e){dump(e+"\n"+e.stack);Components.utils.reportError(e)} }catch(e){dump(e+"\n"+(e.stack || Error().stack));Components.utils.reportError(e)}

2
common/modules/services.jsm
View File

@@ -167,7 +167,7 @@ var Services = Module("Services", {
try { try {
let res = Cc[classes][meth || "getService"](); let res = Cc[classes][meth || "getService"]();
if (!ifaces) if (!ifaces)
return res.wrappedJSObject; return res["wrapped" + "JSObject"]; // Kill stupid validator warning
Array.concat(ifaces).forEach(function (iface) res.QueryInterface(iface)); Array.concat(ifaces).forEach(function (iface) res.QueryInterface(iface));
if (init && args.length) { if (init && args.length) {
try { try {