The Unified and Autonomous Development Platform
Bind CodeMirror keys at document level
robin shen598e4873b2cd
diff --git a/web/src/main/java/com/gitplex/server/web/assets/js/codemirror/CodeMirrorResourceReference.java b/web/src/main/java/com/gitplex/server/web/assets/js/codemirror/CodeMirrorResourceReference.javaindex bc7ff06318..d810ff04f4 100644--- a/web/src/main/java/com/gitplex/server/web/assets/js/codemirror/CodeMirrorResourceReference.java+++ b/web/src/main/java/com/gitplex/server/web/assets/js/codemirror/CodeMirrorResourceReference.java@@ -6,6 +6,7 @@ import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.HeaderItem;import org.apache.wicket.markup.head.JavaScriptHeaderItem;+import com.gitplex.server.web.assets.js.hotkeys.HotkeysResourceReference;import com.gitplex.server.web.page.base.BaseDependentCssResourceReference;import com.gitplex.server.web.page.base.BaseDependentResourceReference;import com.gitplex.server.web.util.resourcebundle.ResourceBundle;@@ -52,6 +53,8 @@ public class CodeMirrorResourceReference extends BaseDependentResourceReferencedependencies.add(JavaScriptHeaderItem.forReference(new WebjarsJavaScriptResourceReference("codemirror/current/mode/meta.js")));dependencies.add(JavaScriptHeaderItem.forReference(new ModeUrlResourceReference()));+ dependencies.add(JavaScriptHeaderItem.forReference(new HotkeysResourceReference()));+dependencies.add(CssHeaderItem.forReference(new WebjarsCssResourceReference("codemirror/current/lib/codemirror.css")));dependencies.add(CssHeaderItem.forReference(new WebjarsCssResourceReference("codemirror/current/theme/eclipse.css")));dependencies.add(CssHeaderItem.forReference(new WebjarsCssResourceReference("codemirror/current/addon/dialog/dialog.css")));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.jsindex bdc805c71c..f1489df890 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@@ -56,5 +56,98 @@ gitplex.server.codemirror = {if (viewState.scroll) {cm.scrollTo(viewState.scroll.left, viewState.scroll.top);}- }+ },+ bindKeys: function() {+ if (!($(document).data("CodeMirrorKeyBinded"))) {+ $(document).data("CodeMirrorKeyBinded", true);++ function find() {+ if ($(".code>.CodeMirror").length != 0) {+ $(".code>.CodeMirror")[0].CodeMirror.execCommand("find");+ return false;+ }+ }+ function findNext() {+ if ($(".code>.CodeMirror").length != 0) {+ $(".code>.CodeMirror")[0].CodeMirror.execCommand("findNext");+ return false;+ }+ }+ function findPrev() {+ if ($(".code>.CodeMirror").length != 0) {+ $(".code>.CodeMirror")[0].CodeMirror.execCommand("findPrev");+ return false;+ }+ }+ function gotoLine() {+ if ($(".code>.CodeMirror").length != 0) {+ $(".code>.CodeMirror")[0].CodeMirror.execCommand("gotoLine");+ return false;+ }+ }+ function goDocStart() {+ if ($(".code>.CodeMirror").length != 0) {+ $(".code>.CodeMirror")[0].CodeMirror.execCommand("goDocStart");+ return false;+ }+ }+ function goDocEnd() {+ if ($(".code>.CodeMirror").length != 0) {+ $(".code>.CodeMirror")[0].CodeMirror.execCommand("goDocEnd");+ return false;+ }+ }+ function goPageUp() {+ if ($(".code>.CodeMirror").length != 0) {+ $(".code>.CodeMirror")[0].CodeMirror.execCommand("goPageUp");+ return false;+ }+ }+ function goPageDown() {+ if ($(".code>.CodeMirror").length != 0) {+ $(".code>.CodeMirror")[0].CodeMirror.execCommand("goPageDown");+ return false;+ }+ }+ function goLineUp() {+ if ($(".code>.CodeMirror").length != 0) {+ $(".code>.CodeMirror")[0].CodeMirror.execCommand("goLineUp");+ return false;+ }+ }+ function goLineDown() {+ if ($(".code>.CodeMirror").length != 0) {+ $(".code>.CodeMirror")[0].CodeMirror.execCommand("goLineDown");+ return false;+ }+ }+ 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();+ }+ });+ } 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+g", gotoLine);+ $(document).bind("keydown", "pageup", goPageUp);+ $(document).bind("keydown", "pagedown", goPageDown);+ $(document).bind("keydown", "up", goLineUp);+ $(document).bind("keydown", "down", goLineDown);+ }+ }};\ No newline at end of filediff --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.jsindex 02b960f71e..4a41302e60 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@@ -503,6 +503,9 @@ gitplex.server = {|| ua.indexOf("ipad") != -1|| ua.indexOf("windows phone") != -1;},+ isMac: function() {+ return navigator.userAgent.indexOf('Mac') != -1;+ },mouseState: {pressed: false,moved: false,diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/depot-blob.js b/web/src/main/java/com/gitplex/server/web/page/depot/blob/depot-blob.jsindex 4be3057d60..062ccaf614 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/depot-blob.js+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/depot-blob.js@@ -1,5 +1,8 @@gitplex.server.depotBlob = {onDomReady: function() {+ // hide browser scrollbar as we will manage it in blob content container+ $("body").css("overflow", "hidden");+$(window).resize(function(e) {e.stopPropagation();@@ -49,9 +52,6 @@ gitplex.server.depotBlob = {onWindowLoad: function() {var cookieKey = "repoFile.searchResult.height";- // hide browser scrollbar as we will manage it in blob content container- $("body").css("overflow", "hidden");-var $searchResult = $("#depot-blob>.search-result");var height = Cookies.get(cookieKey);if (height)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.jsindex e56f76b79b..7335485084 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@@ -31,7 +31,7 @@ gitplex.server.sourceEdit = {}}});- CodeMirror.keyMap.default["Ctrl-L"] = "gotoLine";+ CodeMirror.keyMap.default["Ctrl-G"] = "gotoLine";gitplex.server.codemirror.setMode(cm, filePath);@@ -47,6 +47,19 @@ gitplex.server.sourceEdit = {gitplex.server.codemirror.mark(cm, mark);cm.oldDocValue = cm.doc.getValue();++ gitplex.server.codemirror.bindKeys();++ function hideParentScrollBar() {+ var $scrollable = $sourceEdit.closest(".scrollable");+ /*+ * Hide scroll bar of parent scrollable as we will be using+ * CodeMirror scroll bar+ */+ $scrollable.css("overflow", "visible");+ }++ hideParentScrollBar();cm.on("change", function() {$sourceEdit.closest("form").addClass("dirty");@@ -70,16 +83,6 @@ gitplex.server.sourceEdit = {cm.setSize($sourceEdit.width(), $sourceEdit.height());});- function hideParentScrollBar() {- var $scrollable = $sourceEdit.closest(".scrollable");- /*- * Hide scroll bar of parent scrollable as we will be using- * CodeMirror scroll bar- */- $scrollable.css("overflow", "visible");- }-- hideParentScrollBar();$sourceEdit.on("show", hideParentScrollBar);},onWindowLoad: function(containerId, mark) {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.jsindex c51464bfe1..d6a2947a21 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@@ -32,6 +32,7 @@ gitplex.server.sourceView = {}}};+ CodeMirror.keyMap.default["Ctrl-G"] = "gotoLine";var cm = CodeMirror($code[0], options);gitplex.server.codemirror.setMode(cm, filePath);@@ -63,7 +64,9 @@ gitplex.server.sourceView = {if (blameInfos) {gitplex.server.sourceView.blame(blameInfos);}- gitplex.server.sourceView.highlightCommentTrigger();+ gitplex.server.sourceView.highlightCommentTrigger();++ gitplex.server.codemirror.bindKeys();$code.selectionPopover("init", function() {if (cm.hasFocus()) {