The Unified and Autonomous Development Platform
Make text field clearable
Robin Shen022ef6264fcb
diff --git a/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.html b/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.htmlindex b460bd559a..bb4b073edc 100644--- a/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.html+++ b/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.html@@ -1,7 +1,7 @@<wicket:panel><div class="issue-list"><div class="head">- <form wicket:id="query">+ <form wicket:id="query" class="clearable-wrapper"><div class="input-group no-autofocus"><input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control" placeholder="Query and order issues here"></input><span class="input-group-btn">diff --git a/core/src/main/java/io/onedev/server/web/editable/branchpattern/BranchPatternEditor.html b/core/src/main/java/io/onedev/server/web/editable/branchpattern/BranchPatternEditor.htmlindex 2f485da3da..1b6893780c 100644--- a/core/src/main/java/io/onedev/server/web/editable/branchpattern/BranchPatternEditor.html+++ b/core/src/main/java/io/onedev/server/web/editable/branchpattern/BranchPatternEditor.html@@ -1,3 +1,5 @@<wicket:panel>- <input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control"></input>+ <div class="clearable-wrapper">+ <input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control"></input>+ </div></wicket:panel>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/editable/date/DatePropertyEditor.html b/core/src/main/java/io/onedev/server/web/editable/date/DatePropertyEditor.htmlindex f05080a070..79148f9133 100644--- a/core/src/main/java/io/onedev/server/web/editable/date/DatePropertyEditor.html+++ b/core/src/main/java/io/onedev/server/web/editable/date/DatePropertyEditor.html@@ -1,3 +1,5 @@<wicket:panel>- <input wicket:id="input" type="text" class="form-control"></input>+ <div class="clearable-wrapper">+ <input wicket:id="input" type="text" class="form-control"></input>+ </div></wicket:panel>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/editable/filechoice/FileChoiceEditor.html b/core/src/main/java/io/onedev/server/web/editable/filechoice/FileChoiceEditor.htmlindex 4f0915f59f..9fef077b64 100644--- a/core/src/main/java/io/onedev/server/web/editable/filechoice/FileChoiceEditor.html+++ b/core/src/main/java/io/onedev/server/web/editable/filechoice/FileChoiceEditor.html@@ -1,3 +1,5 @@<wicket:panel>- <input wicket:id="input" autocomplete="off" spellcheck="false" class="form-control"></input>+ <div class="clearable-wrapper">+ <input wicket:id="input" autocomplete="off" spellcheck="false" class="form-control"></input>+ </div></wicket:panel>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/editable/issuequery/IssueQueryEditor.html b/core/src/main/java/io/onedev/server/web/editable/issuequery/IssueQueryEditor.htmlindex 2f485da3da..1b6893780c 100644--- a/core/src/main/java/io/onedev/server/web/editable/issuequery/IssueQueryEditor.html+++ b/core/src/main/java/io/onedev/server/web/editable/issuequery/IssueQueryEditor.html@@ -1,3 +1,5 @@<wicket:panel>- <input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control"></input>+ <div class="clearable-wrapper">+ <input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control"></input>+ </div></wicket:panel>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/editable/numeric/NumericPropertyEditor.html b/core/src/main/java/io/onedev/server/web/editable/numeric/NumericPropertyEditor.htmlindex f05080a070..79148f9133 100644--- a/core/src/main/java/io/onedev/server/web/editable/numeric/NumericPropertyEditor.html+++ b/core/src/main/java/io/onedev/server/web/editable/numeric/NumericPropertyEditor.html@@ -1,3 +1,5 @@<wicket:panel>- <input wicket:id="input" type="text" class="form-control"></input>+ <div class="clearable-wrapper">+ <input wicket:id="input" type="text" class="form-control"></input>+ </div></wicket:panel>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/editable/pathpattern/PathPatternEditor.html b/core/src/main/java/io/onedev/server/web/editable/pathpattern/PathPatternEditor.htmlindex 2f485da3da..1b6893780c 100644--- a/core/src/main/java/io/onedev/server/web/editable/pathpattern/PathPatternEditor.html+++ b/core/src/main/java/io/onedev/server/web/editable/pathpattern/PathPatternEditor.html@@ -1,3 +1,5 @@<wicket:panel>- <input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control"></input>+ <div class="clearable-wrapper">+ <input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control"></input>+ </div></wicket:panel>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/editable/reviewrequirementspec/ReviewRequirementSpecEditor.html b/core/src/main/java/io/onedev/server/web/editable/reviewrequirementspec/ReviewRequirementSpecEditor.htmlindex 2f485da3da..1b6893780c 100644--- a/core/src/main/java/io/onedev/server/web/editable/reviewrequirementspec/ReviewRequirementSpecEditor.html+++ b/core/src/main/java/io/onedev/server/web/editable/reviewrequirementspec/ReviewRequirementSpecEditor.html@@ -1,3 +1,5 @@<wicket:panel>- <input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control"></input>+ <div class="clearable-wrapper">+ <input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control"></input>+ </div></wicket:panel>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/editable/string/StringPropertyEditor.html b/core/src/main/java/io/onedev/server/web/editable/string/StringPropertyEditor.htmlindex 668457c1ed..e323c213a6 100644--- a/core/src/main/java/io/onedev/server/web/editable/string/StringPropertyEditor.html+++ b/core/src/main/java/io/onedev/server/web/editable/string/StringPropertyEditor.html@@ -1,7 +1,9 @@<wicket:panel><div wicket:id="content"></div><wicket:fragment wicket:id="singleLineFrag">- <input wicket:id="input" type="text" class="form-control"></input>+ <div class="clearable-wrapper">+ <input wicket:id="input" type="text" class="form-control"></input>+ </div></wicket:fragment><wicket:fragment wicket:id="multiLineFrag"><textarea wicket:id="input" class="form-control" rows="4"></textarea>diff --git a/core/src/main/java/io/onedev/server/web/editable/tagpattern/TagPatternEditor.html b/core/src/main/java/io/onedev/server/web/editable/tagpattern/TagPatternEditor.htmlindex 2f485da3da..1b6893780c 100644--- a/core/src/main/java/io/onedev/server/web/editable/tagpattern/TagPatternEditor.html+++ b/core/src/main/java/io/onedev/server/web/editable/tagpattern/TagPatternEditor.html@@ -1,3 +1,5 @@<wicket:panel>- <input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control"></input>+ <div class="clearable-wrapper">+ <input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control"></input>+ </div></wicket:panel>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/base/base.css b/core/src/main/java/io/onedev/server/web/page/base/base.cssindex 6303df2468..37e30cf625 100644--- a/core/src/main/java/io/onedev/server/web/page/base/base.css+++ b/core/src/main/java/io/onedev/server/web/page/base/base.css@@ -544,3 +544,30 @@ input.search {font-family: sans-serif;}+.clearable-wrapper {+ position: relative;+}+.clearable-wrapper input.clearable::-ms-clear {+ display: none;+}+a.input-clear {+ font-family: sans-serif;+ display: block;+ width: 24px;+ height: 24px;+ line-height: 24px;+ font-size: 16px;+ position: absolute;+ right: 5px;+ top: 0;+ bottom: 0;+ margin: auto;+ text-decoration: none;+ color: #999;+ z-index: 10;+ background: white;+ text-align: center;+}+a.input-clear.input-group-clear {+ right: 42px;+}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/base/base.js b/core/src/main/java/io/onedev/server/web/page/base/base.jsindex 99a60e3f71..296445951d 100644--- a/core/src/main/java/io/onedev/server/web/page/base/base.js+++ b/core/src/main/java/io/onedev/server/web/page/base/base.js@@ -605,6 +605,39 @@ onedev.server = {}},+ setupInputClear: function() {+ function installClearer($container) {+ $container.find(".clearable-wrapper").each(function() {+ var $wrapper = $(this);+ var $input = $wrapper.find("input[type=text]:visible, input:not([type]):visible");+ if (!$input.hasClass("clearable")) {+ $input.addClass("clearable");+ var $clear = $("<a class='input-clear'>x</a>");+ $wrapper.append($clear);+ if ($input.next().hasClass("input-group-btn"))+ $clear.addClass("input-group-clear");+ $clear.click(function() {+ $input.val("");+ $input.focus();+ $input.trigger("input");+ });+ function setVisibility() {+ if ($input.val() != "")+ $clear.show();+ else+ $clear.hide();+ }+ $input.on("input change", setVisibility);+ setVisibility();+ }+ });+ }+ $(document).on("elementReplaced", function(event, componentId) {+ installClearer($("#" + componentId));+ });+ installClearer($(document));+ },+onDomReady: function() {onedev.server.setupAjaxLoadingIndicator();onedev.server.form.setupDirtyCheck();@@ -612,6 +645,7 @@ onedev.server = {onedev.server.setupWebsocketCallback();onedev.server.mouseState.track();onedev.server.ajaxRequests.track();+ onedev.server.setupInputClear();$(document).keydown(function(e) {if (e.keyCode == 27)@@ -625,6 +659,7 @@ onedev.server = {onWindowLoad: function() {onedev.server.setupAutoSize();+/** Browser will also issue resize event after window is loaded, but that is too late,* as getFromHistoryAndSetToView() must be happened after view size has been adjusteddiff --git a/core/src/main/java/io/onedev/server/web/page/group/GroupAuthorizationsPage.html b/core/src/main/java/io/onedev/server/web/page/group/GroupAuthorizationsPage.htmlindex 750aaa0f7a..9440edc6b5 100644--- a/core/src/main/java/io/onedev/server/web/page/group/GroupAuthorizationsPage.html+++ b/core/src/main/java/io/onedev/server/web/page/group/GroupAuthorizationsPage.html@@ -1,7 +1,7 @@<wicket:extend><div class="authorization list"><div class="head clearfix">- <div class="pull-left">+ <div class="pull-left clearable-wrapper"><input wicket:id="filterProjects" class="form-control search" placeholder="Filter by project name"></input></div><div class="pull-left">diff --git a/core/src/main/java/io/onedev/server/web/page/group/GroupListPage.html b/core/src/main/java/io/onedev/server/web/page/group/GroupListPage.htmlindex 4d1dd7c671..362c48e569 100644--- a/core/src/main/java/io/onedev/server/web/page/group/GroupListPage.html+++ b/core/src/main/java/io/onedev/server/web/page/group/GroupListPage.html@@ -1,7 +1,7 @@<wicket:extend><div class="group list"><div class="head clearfix">- <div class="pull-left">+ <div class="pull-left clearable-wrapper"><input wicket:id="filterGroups" class="form-control search" placeholder="Filter by name"></input></div><div class="pull-left">diff --git a/core/src/main/java/io/onedev/server/web/page/group/GroupMembershipsPage.html b/core/src/main/java/io/onedev/server/web/page/group/GroupMembershipsPage.htmlindex 56494e2a80..d4b3c96acf 100644--- a/core/src/main/java/io/onedev/server/web/page/group/GroupMembershipsPage.html+++ b/core/src/main/java/io/onedev/server/web/page/group/GroupMembershipsPage.html@@ -1,7 +1,7 @@<wicket:extend><div class="membership list"><div class="head clearfix">- <div class="pull-left">+ <div class="pull-left clearable-wrapper"><input wicket:id="filterUsers" class="form-control search" placeholder="Filter by user name"></input></div><div class="pull-left">diff --git a/core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.html b/core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.htmlindex 9ac6a0dcc6..269a9347dd 100644--- a/core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.html+++ b/core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.html@@ -1,7 +1,7 @@<wicket:extend><div class="project list"><div class="head clearfix">- <div class="pull-left">+ <div class="pull-left clearable-wrapper"><input wicket:id="filterProjects" class="form-control search" placeholder="Filter projects"></input></div><div class="pull-left">diff --git a/core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.html b/core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.htmlindex ed573198bf..5aae5515a8 100644--- a/core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.html+++ b/core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.html@@ -7,7 +7,7 @@<span class="input-group-addon">Base</span><input wicket:id="baseBranch" type="hidden" class="form-control"></input></div>- <div class="pull-left">+ <div class="pull-left clearable-wrapper"><input wicket:id="searchBranches" class="form-control search" placeholder="Search branches"></input></div><div class="pull-left">diff --git a/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.html b/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.htmlindex db947e5eea..1f8fbc6a66 100644--- a/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.html+++ b/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.html@@ -1,7 +1,7 @@<wicket:extend><div id="repo-commits"><div class="head">- <form wicket:id="query" class="query no-autofocus">+ <form wicket:id="query" class="query no-autofocus clearable-wrapper"><div class="input-group"><input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control" placeholder="Filter by branch, tag, commit id, file path, date, user or commit message"></input><span class="input-group-btn">diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.html b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.htmlindex 59de37ca23..7419baeadf 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.html+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.html@@ -79,7 +79,7 @@</wicket:fragment><wicket:fragment wicket:id="titleEditFrag"><div wicket:id="feedback"></div>- <form wicket:id="form" class="form-inline">+ <form wicket:id="form" class="form-inline clearable-wrapper"><input wicket:id="title" type="text" placeholder="Input title" class="form-control"></input><input wicket:id="save" type="submit" value="Save" class="btn btn-primary"/><input wicket:id="cancel" type="button" value="Cancel" class="btn btn-default"/>diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/issue-detail.css b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/issue-detail.cssindex 17c8fae294..816992b79d 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/issue-detail.css+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/issue-detail.css@@ -11,7 +11,7 @@color: #444;position: relative;}-#issue-detail>.main>.title a {+#issue-detail>.main>.title a.edit {color: #666;margin-left: 8px;}@@ -19,6 +19,10 @@width: 600px;font-weight: normal;}+#issue-detail>.main>.title .input-clear {+ right: auto;+ left: 573px;+}#issue-detail>.main>.title .alert {font-weight: normal;font-size: 14px;diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/issue-list.css b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/issue-list.cssindex 86164ae1d1..fcf3ae5296 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/issue-list.css+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/issue-list.css@@ -48,5 +48,6 @@#issue-list>.main {padding-left: 20px;+ vertical-align: top;}diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/RequestDetailPage.html b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/RequestDetailPage.htmlindex f3bbb6e6c2..04f9c7b8d5 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/RequestDetailPage.html+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/RequestDetailPage.html@@ -3,7 +3,7 @@<div wicket:id="requestHead" class="head clearfix"><div wicket:id="title" class="title pull-left"></div><a wicket:id="editLink" title="Edit title" class="edit"><i class="fa fa-pencil"></i></a>- <form wicket:id="editForm" class="pull-left form-inline">+ <form wicket:id="editForm" class="pull-left form-inline clearable-wrapper"><input wicket:id="title" type="text" placeholder="Input title" class="form-control"></input><input wicket:id="save" type="submit" value="Save" class="btn btn-primary"/><input wicket:id="cancel" type="button" value="Cancel" class="btn btn-default"/>diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/request-detail.css b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/request-detail.cssindex 3f4e25702b..616f27e9b1 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/request-detail.css+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/request-detail.css@@ -17,7 +17,7 @@font-size: 16px;}-#request-detail>.head {+#request-detail>.head .title, #request-detail>.head a.edit {font-size: 24px;font-weight: bold;padding: 0;@@ -26,6 +26,11 @@width: 600px;font-weight: normal;}+#request-detail>.head .input-clear {+ right: auto;+ left: 573px;+}+#request-detail>.head a i {color: #999;font-size: 19px;diff --git a/core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.html b/core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.htmlindex b4664cd5b8..b94f8a54d3 100644--- a/core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.html+++ b/core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.html@@ -3,7 +3,7 @@<div id="project-tags"><div class="list"><div class="head clearfix">- <div class="pull-left">+ <div class="pull-left clearable-wrapper"><input wicket:id="searchTags" class="form-control search" placeholder="Search tags"></input></div><div class="pull-left">diff --git a/core/src/main/java/io/onedev/server/web/page/user/UserAuthorizationsPage.html b/core/src/main/java/io/onedev/server/web/page/user/UserAuthorizationsPage.htmlindex 9f59657b6f..1d4864de78 100644--- a/core/src/main/java/io/onedev/server/web/page/user/UserAuthorizationsPage.html+++ b/core/src/main/java/io/onedev/server/web/page/user/UserAuthorizationsPage.html@@ -1,7 +1,7 @@<wicket:extend><div class="authorization list"><div class="head clearfix">- <div class="pull-left">+ <div class="pull-left clearable-wrapper"><input wicket:id="filterProjects" class="form-control search" placeholder="Filter by project name"></input></div><div class="pull-left">diff --git a/core/src/main/java/io/onedev/server/web/page/user/UserListPage.html b/core/src/main/java/io/onedev/server/web/page/user/UserListPage.htmlindex fe96eef19a..503a7de88f 100644--- a/core/src/main/java/io/onedev/server/web/page/user/UserListPage.html+++ b/core/src/main/java/io/onedev/server/web/page/user/UserListPage.html@@ -1,7 +1,7 @@<wicket:extend><div class="user list"><div class="head clearfix">- <div class="pull-left">+ <div class="pull-left clearable-wrapper"><input wicket:id="filterUsers" class="form-control search" placeholder="Filter by name"></input></div><div class="pull-left">diff --git a/core/src/main/java/io/onedev/server/web/page/user/UserMembershipsPage.html b/core/src/main/java/io/onedev/server/web/page/user/UserMembershipsPage.htmlindex 603fae7b2f..5b54f5e911 100644--- a/core/src/main/java/io/onedev/server/web/page/user/UserMembershipsPage.html+++ b/core/src/main/java/io/onedev/server/web/page/user/UserMembershipsPage.html@@ -1,7 +1,7 @@<wicket:extend><div class="membership list"><div class="head clearfix">- <div class="pull-left">+ <div class="pull-left clearable-wrapper"><input wicket:id="filterGroups" class="form-control search" placeholder="Filter by group name"></input></div><div class="pull-left">diff --git a/core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java b/core/src/main/java/io/onedev/server/web/util/SuggestionUtils.javaindex 78b3569cb1..1eecca7fd3 100644--- a/core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java+++ b/core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java@@ -42,7 +42,8 @@ public class SuggestionUtils {Range match = new Range(index, index+lowerCaseMatchWith.length());InputSuggestion suggestion = new InputSuggestion(branch, match);if (escapeChars != null)- suggestions.add(suggestion.escape(escapeChars));+ suggestion = suggestion.escape(escapeChars);+ suggestions.add(suggestion);}}return suggestions;