Skip to content

The Unified and Autonomous Development Platform

chore: Improve pull request creation usabilities

Robin Shenda459558352f
diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.html b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.html
index 28a89894b8..f25df6e24c 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.html
@@ -37,7 +37,7 @@
</div>
<div class="warning alert alert-notice alert-light-warning">
<a class="close" data-dismiss="alert"><span><wicket:svg href="times" class="icon"/></span></a>
- <div class="message"><wicket:t>Below content is restored from an unsaved change. Clear to discard</wicket:t></div>
+ <div class="message"><wicket:t>Below content is restored from an unsaved change. <a class="clear-unsaved-change">Clear</a> to discard</wicket:t></div>
</div>
<div class="emojis"></div>
<div class="help text-muted font-size-sm">
diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.js b/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.js
index 39ca24094e..bf0ab93f31 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.js
+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.js
@@ -163,30 +163,31 @@ onedev.server.markdown = {
onedev.server.markdown.setupActionMenu($container, $head.find(".normal-mode"));
+ function preview() {
+ /*
+ * in case an ajax call is ongoing we postpone the render
+ * as the ongoing call may alter the component layout
+ */
+ if (onedev.server.ajaxRequests.count != 0) {
+ setTimeout(preview, 10);
+ } else if ($preview.is(":visible")) {
+ callback("render", $input.val());
+ }
+ }
+
var previewTimeout = 500;
$input.doneEvents("input inserted.atwho", function() {
- function render() {
- if (autosaveKey) {
- var content = $input.val();
- if (content.trim().length != 0)
- localStorage.setItem(autosaveKey, content);
- else
- localStorage.removeItem(autosaveKey);
- }
-
- /*
- * in case an ajax call is ongoing we postpone the render
- * as the ongoing call may alter the component layout
- */
- if (onedev.server.ajaxRequests.count != 0) {
- setTimeout(render, 10);
- } else if ($preview.is(":visible")) {
- callback("render", $input.val());
- }
+ if (autosaveKey) {
+ var content = $input.val();
+ if (content.trim().length != 0)
+ localStorage.setItem(autosaveKey, content);
+ else
+ localStorage.removeItem(autosaveKey);
}
-
- render();
+ preview();
}, previewTimeout);
+
+ $input.on("preview", preview);
$input.doneEvents("keydown", function(e) {
if (e.keyCode>=33 && e.keyCode<=40 && $preview.is(":visible")
@@ -954,7 +955,13 @@ onedev.server.markdown = {
var $edit = $body.children(".edit");
var $preview = $body.children(".preview");
var $input = $edit.children("textarea");
-
+ $warning.find(".clear-unsaved-change").click(function() {
+ $warning.hide();
+ $input.val("");
+ $preview.children(".markdown-rendered").html("");
+ localStorage.removeItem(autosaveKey);
+ onedev.server.form.markClean($input.closest("form"));
+ });
if ($body.find(".ui-resizable-handle:visible").length != 0) {
var defaultHeight = 200;
if ($container.hasClass("normal-mode")) {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/base.js b/server-core/src/main/java/io/onedev/server/web/page/base/base.js
index a6a32e5768..9fed7ac2c7 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/base/base.js
+++ b/server-core/src/main/java/io/onedev/server/web/page/base/base.js
@@ -125,10 +125,16 @@ onedev.server = {
$container = $(document);
var selector = "form.leave-confirm.dirty";
var $dirtyForms = $container.find(selector).addBack(selector);
- if ($dirtyForms.length != 0)
- return confirm("There are unsaved changes, do you want to discard and continue?");
- else
+ if ($dirtyForms.length != 0) {
+ if (confirm("There are unsaved changes, do you want to discard and continue?")) {
+ onedev.server.form.markClean($dirtyForms);
+ return true;
+ } else {
+ return false;
+ }
+ } else {
return true;
+ }
}
},
isDarkMode: function() {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/new-pull-request.js b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/new-pull-request.js
index 3951eafaa9..1505f2c14a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/new-pull-request.js
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/new-pull-request.js
@@ -76,7 +76,7 @@ onedev.server.newPullRequest = {
if (description) {
$descriptionInput.val(description);
- $descriptionInput.trigger("input");
+ $descriptionInput.trigger("preview");
}
}