Changeset 206426 in webkit

Timestamp:

Sep 27, 2016 2:27:28 AM (8 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK] Mac defaults are used for key shortcuts on Linux
​https://bugs.webkit.org/show_bug.cgi?id=162564

Don't set Mac's default keymap as a fallthrough for CodeMirror when we
are not on Mac.

Patch by Tomas Popela <​tpopela@redhat.com> on 2016-09-27
Reviewed by Carlos Garcia Campos.

• UserInterface/Test.html: Include Platform.js for the

WebInspector.Platform definition.

• UserInterface/Views/CodeMirrorAdditions.js:

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Test.html (modified) (1 diff)
• UserInterface/Views/CodeMirrorAdditions.js (modified) (2 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2016-09-27  Tomas Popela  <tpopela@redhat.com>
+
+        [GTK] Mac defaults are used for key shortcuts on Linux
+        https://bugs.webkit.org/show_bug.cgi?id=162564
+
+        Don't set Mac's default keymap as a fallthrough for CodeMirror when we
+        are not on Mac.
+
+        Reviewed by Carlos Garcia Campos.
+
+        * UserInterface/Test.html: Include Platform.js for the
+        WebInspector.Platform definition.
+        * UserInterface/Views/CodeMirrorAdditions.js:
+
 2016-09-26  Matt Baker  <mattbaker@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/Test.html

@@ -38 +38 @@
     <script src="Base/WebInspector.js"></script>
     <script src="Base/InspectorFrontendHostStub.js"></script>
+    <script src="Base/Platform.js"></script>
     <script src="Base/LinkedList.js"></script>
     <script src="Base/ListMultimap.js"></script>

trunk/Source/WebInspectorUI/UserInterface/Views/CodeMirrorAdditions.js

@@ -573 +573 @@
     });
 
+    let mac = WebInspector.Platform.name === "mac";
+
     CodeMirror.keyMap["default"] = {
         "Alt-Up": alterNumber.bind(null, 1),
@@ -587 +589 @@
         "Cmd-D": "selectNextOccurrence",
         "Shift-Tab": "indentLess",
-        fallthrough: "macDefault"
+        fallthrough: mac ? "macDefault" : "pcDefault"
     };