Merge pull request mozilla#17185 from Snuffleupagus/annotationLayer-m…

…odifier Fix `WidgetAnnotationElement._getKeyModifier` to account for Linux
timvandermeij · Oct 28, 2023 · 238f3e7 · 238f3e7
2 parents 3f0b3b1 + 069096e
commit 238f3e7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/src/display/annotation_layer.js b/src/display/annotation_layer.js
@@ -1018,8 +1018,7 @@ class WidgetAnnotationElement extends AnnotationElement {
   }
 
   _getKeyModifier(event) {
-    const { isWin, isMac } = FeatureTest.platform;
-    return (isWin && event.ctrlKey) || (isMac && event.metaKey);
+    return FeatureTest.platform.isMac ? event.metaKey : event.ctrlKey;
   }
 
   _setEventListener(element, elementData, baseName, eventName, valueGetter) {

diff --git a/src/shared/util.js b/src/shared/util.js
@@ -619,10 +619,9 @@ class FeatureTest {
       (typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC")) &&
       typeof navigator === "undefined"
     ) {
-      return shadow(this, "platform", { isWin: false, isMac: false });
+      return shadow(this, "platform", { isMac: false });
     }
     return shadow(this, "platform", {
-      isWin: navigator.platform.includes("Win"),
       isMac: navigator.platform.includes("Mac"),
     });
   }