The Unified and Autonomous Development Platform
Fix the bug that search field can not be focused while view a file
Robin Shenc5277545af97
diff --git a/web/src/main/java/com/turbodev/server/web/asset/hotkeys/HotkeysResourceReference.java b/web/src/main/java/com/turbodev/server/web/asset/hotkeys/HotkeysResourceReference.javaindex a8ddc24037..c1098c88ff 100644--- a/web/src/main/java/com/turbodev/server/web/asset/hotkeys/HotkeysResourceReference.java+++ b/web/src/main/java/com/turbodev/server/web/asset/hotkeys/HotkeysResourceReference.java@@ -13,7 +13,7 @@ public class HotkeysResourceReference extends JavaScriptResourceReference {private static final long serialVersionUID = 1L;public HotkeysResourceReference() {- super(HotkeysResourceReference.class, "jquery.hotkeys.patched.js");+ super(HotkeysResourceReference.class, "jquery.hotkeys.js");}@Overridediff --git a/web/src/main/java/com/turbodev/server/web/asset/hotkeys/jquery.hotkeys.patched.js b/web/src/main/java/com/turbodev/server/web/asset/hotkeys/jquery.hotkeys.jssimilarity index 97%rename from web/src/main/java/com/turbodev/server/web/asset/hotkeys/jquery.hotkeys.patched.jsrename to web/src/main/java/com/turbodev/server/web/asset/hotkeys/jquery.hotkeys.jsindex f5903f751b..fd47e0833a 100644--- a/web/src/main/java/com/turbodev/server/web/asset/hotkeys/jquery.hotkeys.patched.js+++ b/web/src/main/java/com/turbodev/server/web/asset/hotkeys/jquery.hotkeys.js@@ -147,9 +147,9 @@// Patched to still fire events if key is triggered by a readonly input elementif (this !== event.target &&(jQuery.hotkeys.options.filterInputAcceptingElements &&- jQuery.hotkeys.textInputTypes.test(event.target.nodeName) && !jQuery(event.target).is('[readonly]') ||+ jQuery.hotkeys.textInputTypes.test(event.target.nodeName) ||(jQuery.hotkeys.options.filterContentEditable && jQuery(event.target).attr('contenteditable')) ||- (jQuery.hotkeys.options.filterTextInputs && !jQuery(event.target).is('[readonly]') &&+ (jQuery.hotkeys.options.filterTextInputs &&jQuery.inArray(event.target.type, jQuery.hotkeys.textAcceptingInputTypes) > -1))) {return;}diff --git a/web/src/main/java/com/turbodev/server/web/page/base/base.js b/web/src/main/java/com/turbodev/server/web/page/base/base.jsindex 1aea740a34..1282ba29f2 100644--- a/web/src/main/java/com/turbodev/server/web/page/base/base.js+++ b/web/src/main/java/com/turbodev/server/web/page/base/base.js@@ -533,6 +533,10 @@ turbodev.server = {},},util: {+ canInput: function(element) {+ var $element = $(element);+ return ($element.is("input") || $element.is("textarea") && $element.is("select")) && !$element.hasClass("readonly");+ },isDevice: function() {var ua = navigator.userAgent.toLowerCase();return ua.indexOf("android") != -1diff --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.javaindex 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 BaseDependentResourceReferenceList<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.jsindex b4e7862ecf..5cd149c068 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@@ -88,13 +88,18 @@ 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");+ /*+ * Do not use hotkey plugin here as otherwise codemirror readonly mode can not focus+ * to search+ */+ $(document).on("keydown", function(e) {+ if ($(".modal:visible").length == 0 && !turbodev.server.util.canInput(e.target)) {+ if (e.keyCode == 84) {+ callback("quickSearch");+ } else if (e.keyCode == 86) {+ callback("advancedSearch");+ }+ }});},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.jsindex 5586992643..20ec94e62e 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@@ -56,9 +56,13 @@ turbodev.server.sourceView = {if (!($(document).data("SourceViewShortcutsBinded"))) {$(document).data("SourceViewShortcutsBinded", true);- $(document).bind("keydown", "o", function(e) {- if ($(".modal:visible").length == 0) {- e.preventDefault();+ /*+ * Do not use hotkey plugin here as otherwise codemirror readonly mode can not focus+ * to search+ */+ $(document).on("keydown", function(e) {+ if ($(".modal:visible").length == 0 && !turbodev.server.util.canInput(e.target)+ && e.keyCode == 79) {var $sourceView = $(".source-view");if ($sourceView.length != 0 && $(".outline-toggle").length != 0)$sourceView.data("callback")("outlineSearch");@@ -79,7 +83,7 @@ turbodev.server.sourceView = {}});- $code.find("textarea").attr("readonly", "readonly");+ $code.find("textarea").addClass("readonly");$code.mouseover(function(e) {var node = e.target || e.srcElement, $node = $(node);