Import r6976 from upstream hg supporting Firefox up to 25.*

[dactyl.git] / common / modules / main.jsm

diff --git a/common/modules/main.jsm b/common/modules/main.jsm
index ae6926d003589188bc6c1e821076575c24428bb4..19e36b46a11574f9bd27e16ec7a69e24c867ee3a 100644 (file)
--- a/common/modules/main.jsm
+++ b/common/modules/main.jsm
@@ -149,9 +149,9 @@ var Modules = function Modules(window) {
 
         get ownPropertyValues() array.compact(
                 Object.getOwnPropertyNames(this)
-                      .map(function (name) Object.getOwnPropertyDescriptor(this, name).value, this)),
+                      .map(name => Object.getOwnPropertyDescriptor(this, name).value)),
 
-        get moduleList() this.ownPropertyValues.filter(function (mod) mod instanceof this.ModuleBase || mod.isLocalModule, this)
+        get moduleList() this.ownPropertyValues.filter(mod => (mod instanceof this.ModuleBase || mod.isLocalModule))
     });
 
     modules.plugins = create(modules);
@@ -161,7 +161,8 @@ var Modules = function Modules(window) {
 
 config.loadStyles();
 
-overlay.overlayWindow(Object.keys(config.overlays), function _overlay(window) ({
+overlay.overlayWindow(Object.keys(config.overlays),
+                      function _overlay(window) ({
     ready: function onInit(document) {
         const modules = Modules(window);
         modules.moduleManager = this;
@@ -179,7 +180,7 @@ overlay.overlayWindow(Object.keys(config.overlays), function _overlay(window) ({
                   });
 
             config.modules.window
-                  .forEach(function (name) defineModule.time("load", name, modules.load, modules, name));
+                  .forEach(name => { defineModule.time("load", name, modules.load, modules, name); });
         }, this);
     },
 
@@ -224,7 +225,7 @@ overlay.overlayWindow(Object.keys(config.overlays), function _overlay(window) ({
     },
 
     cleanup: function cleanup(window) {
-        overlay.windows = overlay.windows.filter(function (w) w != window);
+        overlay.windows = overlay.windows.filter(w => w != window);
     },
 
     unload: function unload(window) {