Issue 1434 - Removed remaining non-standard JavaScript code from buildtools

lib/keySelector.js

 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 Cu.import("resource://gre/modules/Services.jsm");
 
-let validModifiers =
-{
-  ACCEL: null,
-  CTRL: "control",
-  CONTROL: "control",
-  SHIFT: "shift",
-  ALT: "alt",
-  META: "meta",
-  __proto__: null
-};
+let validModifiers = Object.create(null);
+validModifiers.ACCEL = null;
+validModifiers.CTRL = "control";
+validModifiers.CONTROL = "control";
+validModifiers.SHIFT = "shift";
+validModifiers.ALT = "alt";
+validModifiers.META = "meta";
 
 /**
  * Sets the correct value of validModifiers.ACCEL.
  */
 function initAccelKey()
 {
   validModifiers.ACCEL = "control";
   try
   {
     let accelKey = Services.prefs.getIntPref("ui.key.accelKey");
@@ skipping 32 matching lines @@
   _existingShortcuts: null,
 
   /**
    * Sets up _existingShortcuts property for a window.
    */
   _initExistingShortcuts: function(/**ChromeWindow*/ window)
   {
     if (!validModifiers.ACCEL)
       initAccelKey();
 
-    this._existingShortcuts = {__proto__: null};
+    this._existingShortcuts = Object.create(null);
 
     let keys = window.document.getElementsByTagName("key");
     for (let i = 0; i < keys.length; i++)
     {
       let key = keys[i];
       let keyData =
       {
         shift: false,
         meta: false,
         alt: false,
         control: false,
         char: null,
         code: null
       };
 
       let keyChar = key.getAttribute("key");
       if (keyChar && keyChar.length == 1)
         keyData.char = keyChar.toUpperCase();
 
       let keyCode = key.getAttribute("keycode");
       if (keyCode && "DOM_" + keyCode.toUpperCase() in Ci.nsIDOMKeyEvent)
         keyData.code = Ci.nsIDOMKeyEvent["DOM_" + keyCode.toUpperCase()];
 
       if (!keyData.char && !keyData.code)
         continue;
 
       let keyModifiers = key.getAttribute("modifiers");
       if (keyModifiers)
-        for each (let modifier in keyModifiers.toUpperCase().match(/\w+/g))
+        for (let modifier of keyModifiers.toUpperCase().match(/\w+/g))
           if (modifier in validModifiers)
             keyData[validModifiers[modifier]] = true;
 
       let canonical = [keyData.shift, keyData.meta, keyData.alt, keyData.control, keyData.char || keyData.code].join(" ");
       this._existingShortcuts[canonical] = true;
     }
   },
 
   /**
    * Selects a keyboard shortcut variant that isn't already taken,
    * parses it into an object.
    */
   selectKey: function(/**String*/ variants) /**Object*/
   {
-    for each (let variant in variants.split(/\s*,\s*/))
+    for (let variant of variants.split(/\s*,\s*/))
     {
       if (!variant)
         continue;
 
       let keyData =
       {
         shift: false,
         meta: false,
         alt: false,
         control: false,
         char: null,
         code: null,
         codeName: null
       };
-      for each (let part in variant.toUpperCase().split(/\s+/))
+      for (let part of variant.toUpperCase().split(/\s+/))
       {
         if (part in validModifiers)
           keyData[validModifiers[part]] = true;
         else if (part.length == 1)
           keyData.char = part;
         else if ("DOM_VK_" + part in Ci.nsIDOMKeyEvent)
         {
           keyData.code = Ci.nsIDOMKeyEvent["DOM_VK_" + part];
           keyData.codeName = "VK_" + part;
         }
@@ skipping 67 matching lines @@
     return false;
   if (key.meta != event.metaKey || key.control != event.ctrlKey)
     return false;
 
   if (key.char && event.charCode && String.fromCharCode(event.charCode).toUpperCase() == key.char)
     return true;
   if (key.code && event.keyCode && event.keyCode == key.code)
     return true;
   return false;
 };