Remove AppConstants and do stuff in preproccessor, also remove unsupported OS code

https://web.archive.org/web/20200425044233/https://github.com/MoonchildProductions/UXP/issues/65

1 files changed, 2 insertions, 22 deletions

diff --git a/webbrowser/base/content/autocomplete.xml b/webbrowser/base/content/autocomplete.xml
index bd09284..106e7f9 100644
--- a/webbrowser/base/content/autocomplete.xml
+++ b/webbrowser/base/content/autocomplete.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0"?>
-<!-- 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/. -->
 
 <bindings id="privateAutocompleteBindings"
           xmlns="http://www.mozilla.org/xbl"
@@ -449,12 +446,9 @@
 
           var cancel = false;
 
-          let { AppConstants } =
-              Components.utils.import("resource://gre/modules/AppConstants.jsm", {});
           // Catch any keys that could potentially move the caret. Ctrl can be
-          // used in combination with these keys on Windows and Linux; and Alt
-          // can be used on OS X, so make sure the unused one isn't used.
-          let metaKey = AppConstants.platform == "macosx" ? aEvent.ctrlKey : aEvent.altKey;
+          // used in combination with these keys on Linux
+          let metaKey = aEvent.altKey;
           if (!this.disableKeyNavigation && !metaKey) {
             switch (aEvent.keyCode) {
               case KeyEvent.DOM_VK_LEFT:
@@ -492,11 +486,6 @@
               cancel = this.mController.handleEscape();
               break;
             case KeyEvent.DOM_VK_RETURN:
-              if (AppConstants.platform == "macosx") {
-                // Prevent the default action, since it will beep on Mac
-                if (aEvent.metaKey)
-                  aEvent.preventDefault();
-              }
               this.mEnterEvent = aEvent;
               if (this.mController.selection) {
                 this._selectionDetails = {
@@ -507,15 +496,9 @@
               cancel = this.handleEnter();
               break;
             case KeyEvent.DOM_VK_DELETE:
-              if (AppConstants.platform == "macosx" && !aEvent.shiftKey) {
-                break;
-              }
               cancel = this.handleDelete();
               break;
             case KeyEvent.DOM_VK_BACK_SPACE:
-              if (AppConstants.platform == "macosx" && aEvent.shiftKey) {
-                cancel = this.handleDelete();
-              }
               break;
             case KeyEvent.DOM_VK_DOWN:
             case KeyEvent.DOM_VK_UP:
@@ -523,9 +506,6 @@
                 this.toggleHistoryPopup();
               break;
             case KeyEvent.DOM_VK_F4:
-              if (AppConstants.platform != "macosx") {
-                this.toggleHistoryPopup();
-              }
               break;
           }