Skip to content

The Unified and Autonomous Development Platform

Fix some key binding issues of Safari

robin shen3e365c8609d2
diff --git a/web/src/main/java/com/gitplex/server/web/assets/js/codemirror/codemirror.js b/web/src/main/java/com/gitplex/server/web/assets/js/codemirror/codemirror.js
index f1489df890..8ac35fc652 100644
--- a/web/src/main/java/com/gitplex/server/web/assets/js/codemirror/codemirror.js
+++ b/web/src/main/java/com/gitplex/server/web/assets/js/codemirror/codemirror.js
@@ -57,7 +57,24 @@ gitplex.server.codemirror = {
cm.scrollTo(viewState.scroll.left, viewState.scroll.top);
}
},
- bindKeys: function() {
+ bindKeys: function(cm) {
+ cm.setOption("extraKeys", {
+ "F11": function(cm) {
+ cm.setOption("fullScreen", !cm.getOption("fullScreen"));
+ },
+ "Esc": function(cm) {
+ if (cm.getOption("fullScreen")) {
+ cm.setOption("fullScreen", false);
+ $(window).resize();
+ }
+ }
+ });
+ if (gitplex.server.isMac()) {
+ CodeMirror.keyMap.default["Cmd-L"] = "gotoLine";
+ } else {
+ CodeMirror.keyMap.default["Ctrl-L"] = "gotoLine";
+ }
+
if (!($(document).data("CodeMirrorKeyBinded"))) {
$(document).data("CodeMirrorKeyBinded", true);
@@ -122,28 +139,20 @@ gitplex.server.codemirror = {
}
}
if (gitplex.server.isMac()) {
- $(document).keydown(function(e) {
- if (e.metaKey && !e.ctrlKey && !e.altKey) {
- if (!e.shiftKey && e.keyCode == 70)
- return find();
- else if (e.shiftKey && e.keyCode == 71)
- return findPrev();
- else if (!e.shiftKey && e.keyCode == 71)
- return findNext();
- else if (!e.shiftKey && e.keyCode == 38)
- return goDocStart();
- else if (!e.shiftKey && e.keyCode == 40)
- return goDocEnd();
- }
- });
+ $(document).bind("keydown", "Meta+f", find);
+ $(document).bind("keydown", "Meta+g", findNext);
+ $(document).bind("keydown", "Meta+Shift+g", findPrev);
+ $(document).bind("keydown", "Meta+up", goDocStart);
+ $(document).bind("keydown", "Meta+down", goDocEnd);
+ $(document).bind("keydown", "Meta+l", gotoLine);
} else {
$(document).bind("keydown", "Ctrl+f", find);
$(document).bind("keydown", "Ctrl+g", findNext);
$(document).bind("keydown", "Ctrl+Shift+g", findPrev);
$(document).bind("keydown", "Ctrl+home", goDocStart);
$(document).bind("keydown", "Ctrl+end", goDocEnd);
+ $(document).bind("keydown", "Ctrl+l", gotoLine);
}
- $(document).bind("keydown", "Ctrl+g", gotoLine);
$(document).bind("keydown", "pageup", goPageUp);
$(document).bind("keydown", "pagedown", goPageDown);
$(document).bind("keydown", "up", goLineUp);
diff --git a/web/src/main/java/com/gitplex/server/web/assets/js/codemirror/identifier-highlighter.js b/web/src/main/java/com/gitplex/server/web/assets/js/codemirror/identifier-highlighter.js
index 8c469d5ae2..9a301b9b91 100644
--- a/web/src/main/java/com/gitplex/server/web/assets/js/codemirror/identifier-highlighter.js
+++ b/web/src/main/java/com/gitplex/server/web/assets/js/codemirror/identifier-highlighter.js
@@ -72,9 +72,9 @@
state.overlay = null;
}
var query = line.slice(token.start, token.end);
- if (query.startsWith("'") || query.startsWith("\""))
+ if (query.indexOf('\'') === 0 || query.indexOf('"') === 0)
query = query.substring(1);
- if (query.endsWith("'") || query.endsWith("\""))
+ if (query.indexOf('\'') === 0 || query.indexOf('"') === 0)
query = query.substring(0, query.length-1);
if (query.length != 0) {
cm.addOverlay(state.overlay = makeOverlay(query, re, state.style));
diff --git a/web/src/main/java/com/gitplex/server/web/component/modal/ModalPanel.java b/web/src/main/java/com/gitplex/server/web/component/modal/ModalPanel.java
index 70442aee19..202b789292 100644
--- a/web/src/main/java/com/gitplex/server/web/component/modal/ModalPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/modal/ModalPanel.java
@@ -64,7 +64,7 @@ public abstract class ModalPanel extends Panel {
response.render(JavaScriptHeaderItem.forReference(new ModalResourceReference()));
- String script = String.format("gitplex.server.modal.init('%s', %s);",
+ String script = String.format("gitplex.server.modal.onDomReady('%s', %s);",
getMarkupId(true), getCallbackFunction());
response.render(OnDomReadyHeaderItem.forScript(script));
}
diff --git a/web/src/main/java/com/gitplex/server/web/component/modal/modal.js b/web/src/main/java/com/gitplex/server/web/component/modal/modal.js
index 59714b9977..faa8e17fc4 100644
--- a/web/src/main/java/com/gitplex/server/web/component/modal/modal.js
+++ b/web/src/main/java/com/gitplex/server/web/component/modal/modal.js
@@ -1,5 +1,5 @@
gitplex.server.modal = {
- init: function(containerId, closeCallback) {
+ onDomReady: function(containerId, closeCallback) {
var $modal = $("#" + containerId + ">.modal");
$modal.data("closeCallback", closeCallback);
@@ -12,7 +12,7 @@ gitplex.server.modal = {
}
});
- // use keydown as keypress does not work in chrome/safari
+ // Use keydown as keypress does not work in chrome/safari
$(document).on("keydown", $modal.data("keydown"));
$modal.modal({backdrop: "static", "keyboard": false});
diff --git a/web/src/main/java/com/gitplex/server/web/page/base/base.js b/web/src/main/java/com/gitplex/server/web/page/base/base.js
index 4a41302e60..2bf4cab530 100644
--- a/web/src/main/java/com/gitplex/server/web/page/base/base.js
+++ b/web/src/main/java/com/gitplex/server/web/page/base/base.js
@@ -539,6 +539,11 @@ gitplex.server = {
gitplex.server.focus.setupAutoFocus();
gitplex.server.setupWebsocketCallback();
gitplex.server.mouseState.track();
+
+ $(document).keydown(function(e) {
+ if (e.keyCode == 27)
+ e.preventDefault();
+ });
},
onWindowLoad: function() {
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-edit.js b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-edit.js
index 7335485084..0a8af28468 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-edit.js
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-edit.js
@@ -18,20 +18,9 @@ gitplex.server.sourceEdit = {
foldGutter: true,
matchBrackets: true,
scrollbarStyle: "simple",
- highlightIdentifiers: {delay: 500},
- extraKeys: {
- "F11": function(cm) {
- cm.setOption("fullScreen", !cm.getOption("fullScreen"));
- },
- "Esc": function(cm) {
- if (cm.getOption("fullScreen")) {
- cm.setOption("fullScreen", false);
- $(window).resize();
- }
- }
- }
+ gutters: ["CodeMirror-linenumbers", "CodeMirror-foldgutter"],
+ highlightIdentifiers: {delay: 500}
});
- CodeMirror.keyMap.default["Ctrl-G"] = "gotoLine";
gitplex.server.codemirror.setMode(cm, filePath);
@@ -48,7 +37,7 @@ gitplex.server.sourceEdit = {
cm.oldDocValue = cm.doc.getValue();
- gitplex.server.codemirror.bindKeys();
+ gitplex.server.codemirror.bindKeys(cm);
function hideParentScrollBar() {
var $scrollable = $sourceEdit.closest(".scrollable");
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-view.js b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-view.js
index d6a2947a21..204f139c23 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-view.js
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-view.js
@@ -5,7 +5,8 @@ gitplex.server.sourceView = {
var $sourceView = $(".source-view");
var $code = $sourceView.children(".code");
- var options = {
+
+ var cm = CodeMirror($code[0], {
value: fileContent,
readOnly: gitplex.server.isDevice()?"nocursor":true,
theme: "eclipse",
@@ -19,22 +20,9 @@ gitplex.server.sourceView = {
matchBrackets: true,
scrollbarStyle: "simple",
highlightIdentifiers: {delay: 500},
- gutters: ["CodeMirror-linenumbers", "CodeMirror-foldgutter"],
- extraKeys: {
- "F11": function(cm) {
- cm.setOption("fullScreen", !cm.getOption("fullScreen"));
- },
- "Esc": function(cm) {
- if (cm.getOption("fullScreen")) {
- cm.setOption("fullScreen", false);
- $(window).resize();
- }
- }
- }
- };
- CodeMirror.keyMap.default["Ctrl-G"] = "gotoLine";
-
- var cm = CodeMirror($code[0], options);
+ gutters: ["CodeMirror-linenumbers", "CodeMirror-foldgutter"]
+ });
+
gitplex.server.codemirror.setMode(cm, filePath);
$sourceView.data("callback", callback);
@@ -66,7 +54,7 @@ gitplex.server.sourceView = {
}
gitplex.server.sourceView.highlightCommentTrigger();
- gitplex.server.codemirror.bindKeys();
+ gitplex.server.codemirror.bindKeys(cm);
$code.selectionPopover("init", function() {
if (cm.hasFocus()) {
@@ -396,7 +384,7 @@ gitplex.server.sourceView = {
gitplex.server.sourceView.onLayoutChange();
// Mark again to make sure marked text still exists in viewport after layout change
- gitplex.server.sourceView.mark(cm, mark);
+ gitplex.server.sourceView.mark(mark);
gitplex.server.sourceView.highlightCommentTrigger();
},
diff --git a/web/src/main/java/com/gitplex/server/web/page/test/TestPage.html b/web/src/main/java/com/gitplex/server/web/page/test/TestPage.html
index 51257a846e..845040b4ba 100644
--- a/web/src/main/java/com/gitplex/server/web/page/test/TestPage.html
+++ b/web/src/main/java/com/gitplex/server/web/page/test/TestPage.html
@@ -1,15 +1,8 @@
<wicket:extend>
- <div class="autofit">content</div>
+ <div id="code"></div>
<script type="text/javascript">
$(function() {
- $(window).resize(function() {
- var state = {};
- $(document).find(".autofit:visible").first().trigger("autofit", state);
- console.log(state.name);
- });
- $(".autofit").on("autofit", function(e, state) {
- state.name = "robin";
- });
+ CodeMirror(document.getElementById("code"));
});
</script>
</wicket:extend>
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/page/test/TestPage.java b/web/src/main/java/com/gitplex/server/web/page/test/TestPage.java
index 8c9092a3c1..70fc2ad58a 100644
--- a/web/src/main/java/com/gitplex/server/web/page/test/TestPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/test/TestPage.java
@@ -1,5 +1,9 @@
package com.gitplex.server.web.page.test;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
+
+import com.gitplex.server.web.assets.js.codemirror.CodeMirrorResourceReference;
import com.gitplex.server.web.page.base.BasePage;
@SuppressWarnings("serial")
@@ -10,4 +14,10 @@ public class TestPage extends BasePage {
super.onInitialize();
}
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(JavaScriptHeaderItem.forReference(new CodeMirrorResourceReference()));
+ }
+
}