Title: [207109] releases/WebKitGTK/webkit-2.14/Source/WebInspectorUI
- Revision
- 207109
- Author
- [email protected]
- Date
- 2016-10-11 05:47:23 -0700 (Tue, 11 Oct 2016)
Log Message
Merge r206426 - [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 <[email protected]> on 2016-09-27
Reviewed by Carlos Garcia Campos.
* UserInterface/Test.html: Include Platform.js for the
WebInspector.Platform definition.
* UserInterface/Views/CodeMirrorAdditions.js:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.14/Source/WebInspectorUI/ChangeLog (207108 => 207109)
--- releases/WebKitGTK/webkit-2.14/Source/WebInspectorUI/ChangeLog 2016-10-11 12:40:00 UTC (rev 207108)
+++ releases/WebKitGTK/webkit-2.14/Source/WebInspectorUI/ChangeLog 2016-10-11 12:47:23 UTC (rev 207109)
@@ -1,3 +1,17 @@
+2016-09-27 Tomas Popela <[email protected]>
+
+ [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-02 Johan K. Jensen <[email protected]>
Web Inspector: NetworkTimelineOverviewGraph.MinimumBarPaddingTime is undefined
Modified: releases/WebKitGTK/webkit-2.14/Source/WebInspectorUI/UserInterface/Test.html (207108 => 207109)
--- releases/WebKitGTK/webkit-2.14/Source/WebInspectorUI/UserInterface/Test.html 2016-10-11 12:40:00 UTC (rev 207108)
+++ releases/WebKitGTK/webkit-2.14/Source/WebInspectorUI/UserInterface/Test.html 2016-10-11 12:47:23 UTC (rev 207109)
@@ -37,6 +37,7 @@
<script src=""
<script src=""
+ <script src=""
<script src=""
<script src=""
<script src=""
Modified: releases/WebKitGTK/webkit-2.14/Source/WebInspectorUI/UserInterface/Views/CodeMirrorAdditions.js (207108 => 207109)
--- releases/WebKitGTK/webkit-2.14/Source/WebInspectorUI/UserInterface/Views/CodeMirrorAdditions.js 2016-10-11 12:40:00 UTC (rev 207108)
+++ releases/WebKitGTK/webkit-2.14/Source/WebInspectorUI/UserInterface/Views/CodeMirrorAdditions.js 2016-10-11 12:47:23 UTC (rev 207109)
@@ -572,6 +572,8 @@
return lineRects;
});
+ let mac = WebInspector.Platform.name === "mac";
+
CodeMirror.keyMap["default"] = {
"Alt-Up": alterNumber.bind(null, 1),
"Ctrl-Alt-Up": alterNumber.bind(null, 0.1),
@@ -585,7 +587,7 @@
"Shift-Alt-PageDown": alterNumber.bind(null, -100),
"Cmd-/": "toggleComment",
"Shift-Tab": "indentLess",
- fallthrough: "macDefault"
+ fallthrough: mac ? "macDefault" : "pcDefault"
};
// Register some extra MIME-types for CodeMirror. These are in addition to the
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
