The Unified and Autonomous Development Platform
Fix issue #710 - Typing too fast in command palette can cause wrong option to be selected
Robin Shenf8c40380ba0a
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/selectbytyping/jquery.selectbytyping.js b/server-core/src/main/java/io/onedev/server/web/asset/selectbytyping/jquery.selectbytyping.jsindex 9f3c7f9d02..bca58a3ec4 100644--- a/server-core/src/main/java/io/onedev/server/web/asset/selectbytyping/jquery.selectbytyping.js+++ b/server-core/src/main/java/io/onedev/server/web/asset/selectbytyping/jquery.selectbytyping.js@@ -11,12 +11,24 @@}function onTab() {- var completion = $(container).find(".active.selectable").data("completion");- if (completion == undefined)- completion = $(container).find(".active.selectable").find("a").addBack("a").data("completion");- if (completion != undefined) {- $input.val(completion);- $input.trigger("input");+ var $container = $(container);+ function complete() {+ var completion = $container.find(".active.selectable").data("completion");+ if (completion == undefined)+ completion = $container.find(".active.selectable").find("a").addBack("a").data("completion");+ if (completion != undefined) {+ $input.val(completion);+ $input.trigger("input");+ }+ }+ var processedInput = $container.data("input");+ if (processedInput != undefined) {+ if (processedInput != $input.val())+ setTimeout(onTab, 100);+ else+ complete();+ } else {+ complete();}return false;}diff --git a/server-core/src/main/java/io/onedev/server/web/component/commandpalette/CommandPalettePanel.html b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/CommandPalettePanel.htmlindex 2cc9f12dad..5969be99b3 100644--- a/server-core/src/main/java/io/onedev/server/web/component/commandpalette/CommandPalettePanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/CommandPalettePanel.html@@ -1,5 +1,5 @@<wicket:panel>- <div class="command-palette">+ <div class="command-palette" data-shit=""><div class="modal-header"><h5 class="modal-title">Command Palette</h5><button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>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 59e83a48bd..e3ef95f036 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@@ -26,6 +26,7 @@ import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.IRequestMapper;import org.apache.wicket.request.mapper.ICompoundRequestMapper;+import org.unbescape.javascript.JavaScriptEscape;import com.google.common.base.Joiner;import com.google.common.base.Preconditions;@@ -219,7 +220,7 @@ public abstract class CommandPalettePanel extends Panel {});input = new TextField<String>("input", Model.of(""));- input.add(new OnTypingDoneBehavior() {+ input.add(new OnTypingDoneBehavior(100) {@Overrideprotected void onTypingDone(AjaxRequestTarget target) {@@ -228,6 +229,18 @@ public abstract class CommandPalettePanel extends Panel {target.add(suggestions);target.add(get("noSuggestions"));++ String script;+ String processedInput = input.getModelObject();+ if (processedInput != null) {+ script = String.format("$('#%s').data('input', '%s');",+ CommandPalettePanel.this.getMarkupId(),+ JavaScriptEscape.escapeJavaScript(processedInput));+ } else {+ script = String.format("$('#%s').data('input', '');",+ CommandPalettePanel.this.getMarkupId());+ }+ target.appendJavaScript(script);}});@@ -246,6 +259,7 @@ public abstract class CommandPalettePanel extends Panel {}.setOutputMarkupPlaceholderTag(true));+ add(AttributeAppender.append("data-input", ""));}private WebMarkupContainer newSuggestions() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/base.css b/server-core/src/main/java/io/onedev/server/web/page/base/base.cssindex bc868e3367..d4bd3c349c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/base/base.css+++ b/server-core/src/main/java/io/onedev/server/web/page/base/base.css@@ -752,8 +752,7 @@ table>thead>tr>th.minimum:last-child, table>tbody>tr>td.minimum:last-child {}span.keycap {white-space: nowrap;- border: 1px solid #aaa;- border-style: outset;+ border: 1px outset var(--muted);border-radius: 4px;padding: 0px 3px 1px 3px;margin: 0px 0px 0px 0px;