Skip to content

The Unified and Autonomous Development Platform

Use readOnly for source view in order to be able to select texts with Ctrl-A

Robin Shen074cd628d806
diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/ProjectBlobResourceReference.java b/web/src/main/java/com/turbodev/server/web/page/project/blob/ProjectBlobResourceReference.java
index ed267b9fa4..2f3cff409c 100644
--- a/web/src/main/java/com/turbodev/server/web/page/project/blob/ProjectBlobResourceReference.java
+++ b/web/src/main/java/com/turbodev/server/web/page/project/blob/ProjectBlobResourceReference.java
@@ -7,7 +7,6 @@ import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import com.turbodev.server.web.asset.cookies.CookiesResourceReference;
-import com.turbodev.server.web.asset.hotkeys.HotkeysResourceReference;
import com.turbodev.server.web.asset.jqueryui.JQueryUIResourceReference;
import com.turbodev.server.web.page.base.BaseDependentCssResourceReference;
import com.turbodev.server.web.page.base.BaseDependentResourceReference;
@@ -25,7 +24,6 @@ public class ProjectBlobResourceReference extends BaseDependentResourceReference
List<HeaderItem> dependencies = super.getDependencies();
dependencies.add(JavaScriptHeaderItem.forReference(new CookiesResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new JQueryUIResourceReference()));
- dependencies.add(JavaScriptHeaderItem.forReference(new HotkeysResourceReference()));
dependencies.add(CssHeaderItem.forReference(
new BaseDependentCssResourceReference(ProjectBlobResourceReference.class, "project-blob.css")));
return dependencies;
diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/project-blob.js b/web/src/main/java/com/turbodev/server/web/page/project/blob/project-blob.js
index 42d02b4566..7b2783cad0 100644
--- a/web/src/main/java/com/turbodev/server/web/page/project/blob/project-blob.js
+++ b/web/src/main/java/com/turbodev/server/web/page/project/blob/project-blob.js
@@ -91,15 +91,15 @@ turbodev.server.projectBlob = {
"autofit", [$blobContent.width(), $blobContent.height()]);
});
- $(document).bind("keydown", "t", function(e) {
- if ($(".modal:visible").length == 0)
- callback("quickSearch");
- });
- $(document).bind("keydown", "v", function(e) {
- if ($(".modal:visible").length == 0)
- callback("advancedSearch");
+ $(document).on("keydown", function(e) {
+ if (e.key == "t") {
+ if ($(".modal:visible").length == 0)
+ callback("quickSearch");
+ } else if (e.key == "v") {
+ if ($(".modal:visible").length == 0)
+ callback("advancedSearch");
+ }
});
-
},
parseCssDimension: function(cssDimension) {
var index = cssDimension.indexOf("px");
diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/SourceViewResourceReference.java b/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/SourceViewResourceReference.java
index 748f629017..8f384b6051 100644
--- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/SourceViewResourceReference.java
+++ b/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/SourceViewResourceReference.java
@@ -10,7 +10,6 @@ import com.turbodev.server.web.asset.clipboard.ClipboardResourceReference;
import com.turbodev.server.web.asset.codemirror.CodeMirrorResourceReference;
import com.turbodev.server.web.asset.cookies.CookiesResourceReference;
import com.turbodev.server.web.asset.doneevents.DoneEventsResourceReference;
-import com.turbodev.server.web.asset.hotkeys.HotkeysResourceReference;
import com.turbodev.server.web.asset.hover.HoverResourceReference;
import com.turbodev.server.web.asset.jqueryui.JQueryUIResourceReference;
import com.turbodev.server.web.asset.scrollintoview.ScrollIntoViewResourceReference;
@@ -34,7 +33,6 @@ public class SourceViewResourceReference extends BaseDependentResourceReference
dependencies.add(JavaScriptHeaderItem.forReference(new HoverResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new ScrollIntoViewResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new DoneEventsResourceReference()));
- dependencies.add(JavaScriptHeaderItem.forReference(new HotkeysResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new CookiesResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new CodeMirrorResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new ClipboardResourceReference()));
diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/source-view.js b/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/source-view.js
index 9e6fd8d81c..7ad9bfb6c5 100644
--- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/source-view.js
+++ b/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/source-view.js
@@ -8,9 +8,7 @@ turbodev.server.sourceView = {
var cm = CodeMirror($code[0], {
value: fileContent,
- // do not use "readOnly: true" here as otherwise CodeMirror will eat key input
- // and the search dialog can not be brought out via shortcuts
- readOnly: "nocursor",
+ readOnly: turbodev.server.isDevice()?"nocursor": true,
theme: "eclipse",
lineNumbers: true,
lineWrapping: lineWrapMode == "Soft wrap",
@@ -58,8 +56,8 @@ turbodev.server.sourceView = {
if (!($(document).data("SourceViewShortcutsBinded"))) {
$(document).data("SourceViewShortcutsBinded", true);
- $(document).bind("keydown", "o", function(e) {
- if ($(".modal:visible").length == 0) {
+ $(document).on("keydown", function(e) {
+ if (e.key == "o" && $(".modal:visible").length == 0) {
e.preventDefault();
var $sourceView = $(".source-view");
if ($sourceView.length != 0 && $(".outline-toggle").length != 0)
@@ -117,6 +115,10 @@ turbodev.server.sourceView = {
return turbodev.server.codemirror.setViewState(cm, viewState);
});
+ $code[0].addEventListener("keydown", function(e) {
+ $(document).trigger("keydown", e);
+ });
+
$sourceView.on("autofit", function(event, width, height) {
if (cm.getOption("fullScreen"))
return;