summaryrefslogtreecommitdiff
path: root/common/modules
diff options
context:
space:
mode:
authorKris Maglione <maglione.k@gmail.com>2011-06-28 19:41:30 -0400
committerKris Maglione <maglione.k@gmail.com>2011-06-28 19:41:30 -0400
commiteefc32dfe417b92205019443205950079ea28cbe (patch)
tree8b794defc3921bb5264be44015264aca42d3ddfb /common/modules
parentbfb111894cd54a6b7ed8e365c784d908803a68c6 (diff)
downloadpentadactyl-eefc32dfe417b92205019443205950079ea28cbe.tar.gz
:set passunknown-=!input
Diffstat (limited to 'common/modules')
-rw-r--r--common/modules/services.jsm1
-rw-r--r--common/modules/util.jsm3
2 files changed, 3 insertions, 1 deletions
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);