diff --git a/common/content/autocommands.js b/common/content/autocommands.js index 37175aca..73cdd20c 100644 --- a/common/content/autocommands.js +++ b/common/content/autocommands.js @@ -70,11 +70,6 @@ var AutoCmdHive = Class("AutoCmdHive", Contexts.Hive, { * @instance autocommands */ var AutoCommands = Module("autocommands", { - init: function () { - if (!config.haveGecko("26")) - delete config.autocommands.DownloadPost; // FIXME - }, - get activeHives() contexts.allGroups.autocmd.filter(h => h._store.length), add: deprecated("group.autocmd.add", { get: function add() autocommands.user.bound.add }), diff --git a/common/content/statusline.js b/common/content/statusline.js index 9110dda4..20ecf1cd 100644 --- a/common/content/statusline.js +++ b/common/content/statusline.js @@ -34,8 +34,7 @@ var StatusLine = Module("statusline", { ] }); - if (config.haveGecko("25")) - config.tabbrowser.getStatusPanel().hidden = true; + config.tabbrowser.getStatusPanel().hidden = true; if (this.statusBar.localName == "toolbar") { styles.system.add("addon-bar", config.styleableChrome, literal(function () /* diff --git a/common/modules/config.jsm b/common/modules/config.jsm index 3805023c..5622126c 100644 --- a/common/modules/config.jsm +++ b/common/modules/config.jsm @@ -48,9 +48,6 @@ var ConfigBase = Class("ConfigBase", { * initialization code. Must call superclass's init function. */ init: function init() { - if (!config.haveGecko("26")) - this.modules.global = this.modules.global.filter(m => m != "downloads"); // FIXME - this.loadConfig(); util.trapErrors(() => { diff --git a/common/modules/main.jsm b/common/modules/main.jsm index 80e64a79..c58789f9 100644 --- a/common/modules/main.jsm +++ b/common/modules/main.jsm @@ -111,58 +111,24 @@ var Modules = function Modules(window) { const BASES = [BASE, "resource://dactyl-local-content/"]; let proxyCache = {}; - if (config.haveGecko(29)) - var proxy = new Proxy(window, { - get: function window_get(target, prop) { - // `in`, not `hasOwnProperty`, because we want to return - // unbound methods in `Object.prototype` - if (prop in proxyCache) - return proxyCache[prop]; + var proxy = new Proxy(window, { + get: function window_get(target, prop) { + // `in`, not `hasOwnProperty`, because we want to return + // unbound methods in `Object.prototype` + if (prop in proxyCache) + return proxyCache[prop]; - let p = target[prop]; - if (callable(p)) - return proxyCache[prop] = p.bind(target); + let p = target[prop]; + if (callable(p)) + return proxyCache[prop] = p.bind(target); - return p; - }, + return p; + }, - set: function window_set(target, prop, val) { - return target[prop] = val; - } - }); - else { - // Bug 814892 - let o = {}; - // Oh, the brokenness... See bug 793210 - Object.preventExtensions(o); - proxy = new Proxy(o, { - get: function window_get(target, prop) { - // `in`, not `hasOwnProperty`, because we want to return - // unbound methods in `Object.prototype` - if (prop in proxyCache) - return proxyCache[prop]; - - let p = window[prop]; - if (callable(p)) - return proxyCache[prop] = p.bind(window); - - return p; - }, - - set: function window_set(target, prop, val) { - return window[prop] = val; - }, - - getOwnPropertyDescriptor: function (target, prop) Object.getOwnPropertyDescriptor(window, prop), - getOwnPropertyNames: function (target, prop) Object.getOwnPropertyNames(window), - defineProperty: function (target, prop, desc) Object.defineProperty(window, prop, desc), - deleteProperty: function (target, prop) { delete window[prop]; }, - has: function (target, prop) prop in window, - hasOwn: function (target, prop) hasOwnProperty(window, prop), - enumerate: function (target) (p for (p in window)), - iterate: function (target) (p for (p of window)) - }); - } + set: function window_set(target, prop, val) { + return target[prop] = val; + } + }); var jsmodules = newContext(proxy, false, "Dactyl `jsmodules`"); jsmodules.NAME = "jsmodules"; diff --git a/pentadactyl/install.rdf b/pentadactyl/install.rdf index 8c4fcd60..f1bd9863 100644 --- a/pentadactyl/install.rdf +++ b/pentadactyl/install.rdf @@ -31,7 +31,7 @@