Title: [206426] trunk/Source/WebInspectorUI
- Revision
- 206426
- Author
- commit-qu...@webkit.org
- Date
- 2016-09-27 02:27:28 -0700 (Tue, 27 Sep 2016)
Log 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 <tpop...@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:
Modified Paths
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (206425 => 206426)
--- trunk/Source/WebInspectorUI/ChangeLog 2016-09-27 09:10:30 UTC (rev 206425)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-09-27 09:27:28 UTC (rev 206426)
@@ -1,3 +1,17 @@
+2016-09-27 Tomas Popela <tpop...@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 <mattba...@apple.com>
Web Inspector: Box Model values not updated when DOM node styles change
Modified: trunk/Source/WebInspectorUI/UserInterface/Test.html (206425 => 206426)
--- trunk/Source/WebInspectorUI/UserInterface/Test.html 2016-09-27 09:10:30 UTC (rev 206425)
+++ trunk/Source/WebInspectorUI/UserInterface/Test.html 2016-09-27 09:27:28 UTC (rev 206426)
@@ -37,6 +37,7 @@
<script src=""
<script src=""
+ <script src=""
<script src=""
<script src=""
<script src=""
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/CodeMirrorAdditions.js (206425 => 206426)
--- trunk/Source/WebInspectorUI/UserInterface/Views/CodeMirrorAdditions.js 2016-09-27 09:10:30 UTC (rev 206425)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/CodeMirrorAdditions.js 2016-09-27 09:27:28 UTC (rev 206426)
@@ -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),
@@ -586,7 +588,7 @@
"Cmd-/": "toggleComment",
"Cmd-D": "selectNextOccurrence",
"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
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
