diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/content/modes.js | 2 | ||||
| -rw-r--r-- | common/modules/services.jsm | 1 | ||||
| -rw-r--r-- | common/modules/util.jsm | 3 |
3 files changed, 4 insertions, 2 deletions
diff --git a/common/content/modes.js b/common/content/modes.js index 523e6cc4..0e16b009 100644 --- a/common/content/modes.js +++ b/common/content/modes.js @@ -638,7 +638,7 @@ var Modes = Module("modes", { options.add(["passunknown", "pu"], "Pass through unknown keys in these modes", - "stringlist", "!text_edit,!input,base", + "stringlist", "!text_edit,base", opts); options.add(["showmode", "smd"], diff --git a/common/modules/services.jsm b/common/modules/services.jsm index dbfe8f90..1afe3fcd 100644 --- a/common/modules/services.jsm +++ b/common/modules/services.jsm @@ -45,6 +45,7 @@ var Services = Module("Services", { ["nsIBrowserHistory", "nsIGlobalHistory3", "nsINavHistoryService", "nsPIPlacesDatabase"]); this.add("io", "@mozilla.org/network/io-service;1", "nsIIOService"); this.add("json", "@mozilla.org/dom/json;1", "nsIJSON", "createInstance"); + this.add("listeners", "@mozilla.org/eventlistenerservice;1", "nsIEventListenerService"); this.add("livemark", "@mozilla.org/browser/livemark-service;2", "nsILivemarkService"); this.add("mime", "@mozilla.org/mime;1", "nsIMIMEService"); this.add("observer", "@mozilla.org/observer-service;1", "nsIObserverService"); diff --git a/common/modules/util.jsm b/common/modules/util.jsm index 688a054a..fcc80c0c 100644 --- a/common/modules/util.jsm +++ b/common/modules/util.jsm @@ -1955,7 +1955,8 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]), let res = [], seen = {}; (function rec(frame) { try { - res = res.concat(util.subdomains(frame.location.hostname)); + if (frame.location.hostname) + res = res.concat(util.subdomains(frame.location.hostname)); } catch (e) {} Array.forEach(frame.frames, rec); |