The Unified and Autonomous Development Platform
Fix issue #708 - Query assist also pops up when press command palette shortcut key
Robin Shen8e45453140b8
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/input-assist.js b/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/input-assist.jsindex 2b1565538b..6c6fdb1b87 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/input-assist.js+++ b/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/input-assist.js@@ -6,6 +6,10 @@ onedev.server.inputassist = {$input.data("prevValue", $input.val());$input.data("prevCaret", -1);+ $input.on("keydown", function(e) {+ if (e.keyCode == 75 && (e.ctrlKey || e.metaKey) && !e.shiftKey) // command palette+ $input.blur();+ });$input.on("paste click keyup assist", function(e) {var value = $input.val();var caret;diff --git a/server-core/src/main/java/io/onedev/server/web/component/commandpalette/CommandPalettePanel.java b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/CommandPalettePanel.javaindex 2d094399ff..59e83a48bd 100644--- a/server-core/src/main/java/io/onedev/server/web/component/commandpalette/CommandPalettePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/CommandPalettePanel.java@@ -15,6 +15,7 @@ import org.apache.wicket.core.request.mapper.MountedMapper;import org.apache.wicket.markup.ComponentTag;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.TextField;@@ -365,6 +366,11 @@ public abstract class CommandPalettePanel extends Panel {public void renderHead(IHeaderResponse response) {super.renderHead(response);response.render(CssHeaderItem.forReference(new CommandPaletteCssResourceReference()));+ response.render(OnDomReadyHeaderItem.forScript(""+ + "var $floating = $('.floating');"+ + "if ($floating.length != 0)"+ + " $floating.data('closeCallback')();"+ + "$('.dropdown-toggle').dropdown('hide');"));}}diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/layout.js b/server-core/src/main/java/io/onedev/server/web/page/layout/layout.jsindex a9247dce3d..b4bb80efb0 100644--- a/server-core/src/main/java/io/onedev/server/web/page/layout/layout.js+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/layout.js@@ -141,11 +141,6 @@ onedev.server.layout = {$("a.command-palette").attr("title", "ctrl-k to show command palette").html("<span class='keycap'>ctrl</span> <span class='keycap'>k</span>");$(document).keydown(function(e) {if (e.keyCode == 75 && (e.ctrlKey || e.metaKey) && !e.shiftKey && $('div.command-palette').length == 0) { // cmd+k- setTimeout(function() {- var $floating = $(".floating");- if ($floating.length != 0)- $floating.data("closeCallback")();- }, 100);commandPaletteCallback();e.preventDefault();return false;