The Unified and Autonomous Development Platform
Add close link to input assist panel
Robin Shena7b03a02ac66
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/AssistPanel.html b/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/AssistPanel.htmlindex 5c03bdfdc5..df037a71e4 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/AssistPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/AssistPanel.html@@ -10,8 +10,7 @@</div><ul class="help list-unstyled"><li wicket:id="hints"></li>- <li class="complete"></li>- <li class="select">↑↓ to select item</li>+ <li><span class='complete'></span> ↑↓ to activate item. Esc to <a wicket:id="close">close</a></li></ul></div></wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/AssistPanel.java b/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/AssistPanel.javaindex ada1e2ad89..e3a09120e6 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/AssistPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/AssistPanel.java@@ -5,6 +5,7 @@ import java.util.List;import org.apache.commons.text.StringEscapeUtils;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;@@ -17,7 +18,7 @@ import io.onedev.commons.utils.LinearRange;import io.onedev.server.web.behavior.infinitescroll.InfiniteScrollBehavior;@SuppressWarnings("serial")-class AssistPanel extends Panel {+abstract class AssistPanel extends Panel {private static final int PAGE_SIZE = 25;@@ -85,9 +86,19 @@ class AssistPanel extends Panel {for (String hint: hints)hintsView.add(new Label(hintsView.newChildId(), hint).setEscapeModelStrings(false));+ add(new AjaxLink<Void>("close") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ onClose(target);+ }++ });setOutputMarkupId(true);}+ protected abstract void onClose(AjaxRequestTarget target);+private Component newSuggestionItem(String itemId, InputCompletion suggestion) {WebMarkupContainer item = new WebMarkupContainer(itemId);LinearRange match = suggestion.getMatch();diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/InputAssistBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/InputAssistBehavior.javaindex 879e35514e..6e4215f771 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/InputAssistBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/InputAssistBehavior.java@@ -155,7 +155,14 @@ public abstract class InputAssistBehavior extends AbstractPostAjaxBehavior {@Overrideprotected Component newContent(String id) {- return new AssistPanel(id, getComponent(), inputStatus, suggestions, getHints(inputStatus));+ return new AssistPanel(id, getComponent(), inputStatus, suggestions, getHints(inputStatus)) {++ @Override+ protected void onClose(AjaxRequestTarget target) {+ close();+ }++ };}@Override@@ -170,7 +177,14 @@ public abstract class InputAssistBehavior extends AbstractPostAjaxBehavior {target.appendJavaScript(script);} else {Component content = dropdown.getContent();- Component newContent = new AssistPanel(content.getId(), getComponent(), inputStatus, suggestions, getHints(inputStatus));+ Component newContent = new AssistPanel(content.getId(), getComponent(), inputStatus, suggestions, getHints(inputStatus)) {++ @Override+ protected void onClose(AjaxRequestTarget target) {+ close();+ }++ };content.replaceWith(newContent);target.add(newContent);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 d375e300f4..7173ef7d79 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@@ -192,9 +192,9 @@ onedev.server.inputassist = {updateHelp: function($dropdown) {if ($dropdown.find("tr.active").length != 0) {- $dropdown.find(".help>.complete").empty().append("Tab or ↵ to complete with selected item");+ $dropdown.find(".help .complete").empty().append("Tab or ↵ to select active item.");} else {- $dropdown.find(".help>.complete").empty().append("Tab to complete with first item");+ $dropdown.find(".help .complete").empty().append("Tab to select first item.");}}};\ No newline at end of file