Skip to content

The Unified and Autonomous Development Platform

Some minor improvements

Robin Shen3157a6f76e92
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.java
index f5427a3bfa..ed0475d154 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
@@ -138,12 +138,9 @@ public abstract class InputAssistBehavior extends AbstractPostAjaxBehavior {
ComponentContext.push(new ComponentContext(getComponent()));
try {
for (InputCompletion suggestion: getSuggestions(new InputStatus(inputContent, inputCaret))) {
- if (!suggestion.getContent().equals(inputStatus.getContent())
- || suggestion.getCaret() != inputStatus.getCaret()) {
- suggestions.add(suggestion);
- if (suggestions.size() >= MAX_SUGGESTIONS)
- break;
- }
+ suggestions.add(suggestion);
+ if (suggestions.size() >= MAX_SUGGESTIONS)
+ break;
}
} finally {
ComponentContext.pop();
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.js
index 6c6fdb1b87..28008eca43 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
@@ -35,14 +35,19 @@ onedev.server.inputassist = {
$input.data("update", function($item) {
var value = $item.data("content");
- $input.val(value);
var caret = $item.data("caret");
- if (caret != undefined)
- $input.caret(caret);
- $input.blur();
- $input.focus();
- $input.trigger("input");
- $input.trigger("assist");
+ if (value != $input.val() || caret != $input.caret()) {
+ $input.val(value);
+ if (caret != undefined)
+ $input.caret(caret);
+ $input.blur();
+ $input.focus();
+ $input.trigger("input");
+ $input.trigger("assist");
+ return true;
+ } else {
+ return false;
+ }
});
$input.bind("keydown", "up", function() {
@@ -108,10 +113,14 @@ onedev.server.inputassist = {
} else {
tabbing = false;
var $active = $dropdown.find("li.active");
- if ($active.length != 0)
+ if ($active.length != 0) {
$input.data("update")($active);
- else if ($dropdown.find("li").length != 0)
- $input.data("update")($dropdown.find("li").first());
+ } else if ($dropdown.find("li").length != 0) {
+ $dropdown.find("li").each(function() {
+ if ($input.data("update")($(this)))
+ return false;
+ });
+ }
}
return false;
} else {
diff --git a/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java b/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java
index 3ef0ee0a8f..b9b6e00db1 100644
--- a/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java
+++ b/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java
@@ -83,7 +83,7 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDa
private static final long serialVersionUID = 1L;
- static final int ORDER=200;
+ static final int ORDER=50;
private static final Object cacheHomeCreationLock = new Object();