Skip to content

The Unified and Autonomous Development Platform

Add auto-save for comment and code edit

robin shen4d287b8286e7
diff --git a/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentListPanel.html b/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentListPanel.html
index 3caab04eb9..6057b1b6b3 100644
--- a/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentListPanel.html
+++ b/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentListPanel.html
@@ -11,7 +11,7 @@
<a wicket:id="allComments" class="btn btn-sm btn-default">All</a>
</div>
<form wicket:id="filterForm">
- <div wicket:id="editor" class="nofocus"></div>
+ <div wicket:id="editor" class="no-autofocus"></div>
<button type="submit" class="btn btn-primary"><i class="fa fa-search"></i> Search</button>
</form>
</div>
diff --git a/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentPanel.java b/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentPanel.java
index f5aca49280..4efd4ec65a 100644
--- a/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentPanel.java
@@ -201,6 +201,8 @@ public abstract class CodeCommentPanel extends Panel {
Form<?> form = new Form<Void>("form");
form.setOutputMarkupId(true);
+ String autosaveKey = "autosave:editCodeComment:" + commentId;
+
CommentInput contentInput = new CommentInput("content", Model.of(getComment().getContent()), true) {
@Override
@@ -213,6 +215,11 @@ public abstract class CodeCommentPanel extends Panel {
return getComment().getDepot();
}
+ @Override
+ protected String getAutosaveKey() {
+ return autosaveKey;
+ }
+
};
form.add(contentInput);
contentInput.setRequired(true);
@@ -261,6 +268,7 @@ public abstract class CodeCommentPanel extends Panel {
fragment.replaceWith(commentContainer);
target.add(commentContainer);
onSaveComment(target, comment);
+ target.appendJavaScript(String.format("localStorage.removeItem('%s');", autosaveKey));
} catch (StaleStateException e) {
error("Some one changed the content you are editing. Reload the page and try again.");
target.add(feedback);
@@ -433,6 +441,7 @@ public abstract class CodeCommentPanel extends Panel {
Fragment fragment = new Fragment(activityContainer.getId(), "activityEditFrag",
CodeCommentPanel.this, Model.of(identity.id));
Form<?> form = new Form<Void>("form");
+ String autosaveKey = "autosave:editCodeCommentActivity:" + identity.id;
CommentInput contentInput = new CommentInput("content", Model.of(identity.getActivity().getNote()),
true) {
@@ -445,6 +454,11 @@ public abstract class CodeCommentPanel extends Panel {
protected Depot getDepot() {
return getComment().getDepot();
}
+
+ @Override
+ protected String getAutosaveKey() {
+ return autosaveKey;
+ }
};
contentInput.setRequired(identity.clazz == CodeCommentReply.class);
@@ -501,8 +515,9 @@ public abstract class CodeCommentPanel extends Panel {
WebMarkupContainer activityContainer = newActivityContainer(componentId, identity.getActivity());
fragment.replaceWith(activityContainer);
target.add(activityContainer);
+ target.appendJavaScript(String.format("localStorage.removeItem('%s');", autosaveKey));
} catch (StaleStateException e) {
- error("Some one changed the content you are editing. Reload the page and try again.");
+ error("Someone changed the content you are editing. Reload the page and try again.");
target.add(feedback);
}
}
@@ -660,6 +675,9 @@ public abstract class CodeCommentPanel extends Panel {
private void onAddReply(AjaxRequestTarget target, boolean changeStatus, @Nullable String placeholder) {
Fragment fragment = new Fragment("addReply", "activityEditFrag", CodeCommentPanel.this);
Form<?> form = new Form<Void>("form");
+
+ String autosaveKey = "autosave:addCodeCommentReply:" + commentId;
+
CommentInput contentInput = new CommentInput("content", Model.of(""), true) {
@Override
@@ -672,6 +690,11 @@ public abstract class CodeCommentPanel extends Panel {
return getComment().getDepot();
}
+ @Override
+ protected String getAutosaveKey() {
+ return autosaveKey;
+ }
+
@Override
protected List<AttributeModifier> getInputModifiers() {
if (placeholder != null)
@@ -743,6 +766,7 @@ public abstract class CodeCommentPanel extends Panel {
GitPlex.getInstance(CodeCommentReplyManager.class).save(reply, true);
onReplyAdded(target, fragment, reply);
}
+ target.appendJavaScript(String.format("localStorage.removeItem('%s');", autosaveKey));
}
};
diff --git a/web/src/main/java/com/gitplex/server/web/component/comment/code-comment.css b/web/src/main/java/com/gitplex/server/web/component/comment/code-comment.css
index 351c20863c..0d9b7297f2 100644
--- a/web/src/main/java/com/gitplex/server/web/component/comment/code-comment.css
+++ b/web/src/main/java/com/gitplex/server/web/component/comment/code-comment.css
@@ -75,3 +75,7 @@
.code-comment>.add-reply>a:hover {
color: inherit;
}
+.code-comment .markdown-rendered {
+ font-size: inherit;
+ line-height: inherit;
+}
diff --git a/web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeletePanel.html b/web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeletePanel.html
index ee4e7f8f4c..20bc7eea3a 100644
--- a/web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeletePanel.html
+++ b/web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeletePanel.html
@@ -9,7 +9,7 @@
</div>
<div class="modal-body">
<div wicket:id="message" class="message"></div>
- <input class="form-control focusable confirm"></input>
+ <input class="form-control autofocus confirm"></input>
</div>
<div class="modal-footer">
<input wicket:id="delete" type="submit" class="btn btn-danger" disabled="disabled" value="Delete"></input>
diff --git a/web/src/main/java/com/gitplex/server/web/component/createbranch/CreateBranchPanel.html b/web/src/main/java/com/gitplex/server/web/component/createbranch/CreateBranchPanel.html
index 7fe25fb725..864bbe3663 100644
--- a/web/src/main/java/com/gitplex/server/web/component/createbranch/CreateBranchPanel.html
+++ b/web/src/main/java/com/gitplex/server/web/component/createbranch/CreateBranchPanel.html
@@ -5,7 +5,7 @@
</div>
<div class="modal-body">
<div wicket:id="feedback"></div>
- <input wicket:id="name" class="form-control focusable">
+ <input wicket:id="name" class="form-control autofocus">
</div>
<div class="modal-footer">
<div class="form-group">
diff --git a/web/src/main/java/com/gitplex/server/web/component/createtag/CreateTagPanel.html b/web/src/main/java/com/gitplex/server/web/component/createtag/CreateTagPanel.html
index cf6e58249c..7b67af4e3b 100644
--- a/web/src/main/java/com/gitplex/server/web/component/createtag/CreateTagPanel.html
+++ b/web/src/main/java/com/gitplex/server/web/component/createtag/CreateTagPanel.html
@@ -7,7 +7,7 @@
<div wicket:id="feedback"></div>
<div class="form-group">
<label>Tag Name</label>
- <input wicket:id="name" class="form-control focusable">
+ <input wicket:id="name" class="form-control autofocus">
</div>
<div class="form-group">
<label>Tag Message</label>
diff --git a/web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffPanel.java b/web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffPanel.java
index a4856e9e1b..2316c9c673 100644
--- a/web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffPanel.java
@@ -745,6 +745,8 @@ public class RevisionDiffPanel extends Panel {
String uuid = UUID.randomUUID().toString();
+ String autosaveKey = "autosave:addCodeCommentOnDiff:" + depotModel.getObject().getId()
+ + ":" + change.getPath();
CommentInput contentInput;
form.add(contentInput = new CommentInput("content", Model.of(""), true) {
@@ -758,6 +760,11 @@ public class RevisionDiffPanel extends Panel {
return depotModel.getObject();
}
+ @Override
+ protected String getAutosaveKey() {
+ return autosaveKey;
+ }
+
});
contentInput.setRequired(true);
@@ -843,7 +850,10 @@ public class RevisionDiffPanel extends Panel {
sourceAware.onCommentAdded(target, comment);
commentSupport.onCommentOpened(target, comment);
- target.appendJavaScript("gitplex.server.revisionDiff.reposition();");
+ target.appendJavaScript(String.format(""
+ + "gitplex.server.revisionDiff.reposition();"
+ + "localStorage.removeItem('%s');",
+ autosaveKey));
}
});
diff --git a/web/src/main/java/com/gitplex/server/web/component/markdown/InsertUrlPanel.html b/web/src/main/java/com/gitplex/server/web/component/markdown/InsertUrlPanel.html
index 09cdc807ad..3a551a7122 100644
--- a/web/src/main/java/com/gitplex/server/web/component/markdown/InsertUrlPanel.html
+++ b/web/src/main/java/com/gitplex/server/web/component/markdown/InsertUrlPanel.html
@@ -9,7 +9,7 @@
<label>Input Url</label>
<form wicket:id="urlForm" class="form-inline url">
<div class="form-group">
- <input wicket:id="url" class="form-control focusable url"></input>
+ <input wicket:id="url" class="form-control autofocus url"></input>
<button wicket:id="ok" type="submit" class="btn btn-default">OK</button>
</div>
<div wicket:id="feedback" class="feedback"></div>
diff --git a/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownEditor.html b/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownEditor.html
index 44d61583aa..4f4b262e19 100644
--- a/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownEditor.html
+++ b/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownEditor.html
@@ -1,5 +1,9 @@
<wicket:panel>
<div wicket:id="container" class="markdown-editor edit-mode autofit no-autosize">
+ <div class="warning alert alert-warning">
+ <button class="close" data-dismiss="alert"><span>&times;</span></button>
+ <div class="message"><i class="fa fa-warning"></i> Below content is restored from an unsaved change</div>
+ </div>
<div class="head clearfix">
<div wicket:id="normalMode" class="pull-left">
<div class="btn-group">
@@ -61,7 +65,7 @@
</div>
<div class="body clearfix">
<div class="edit">
- <textarea wicket:id="input" rows=5></textarea>
+ <textarea wicket:id="input" rows=5 class="autofocus"></textarea>
<div class="ui-resizable-handle ui-resizable-s"></div>
</div>
<div class="preview">
diff --git a/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownEditor.java b/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownEditor.java
index 5e613b41b6..fd45282e8e 100644
--- a/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownEditor.java
+++ b/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownEditor.java
@@ -58,7 +58,7 @@ public class MarkdownEditor extends FormComponentPanel<String> {
private final boolean compactMode;
private final boolean resizable;
-
+
private WebMarkupContainer container;
private TextArea<String> input;
@@ -80,6 +80,12 @@ public class MarkdownEditor extends FormComponentPanel<String> {
this.resizable = resizable;
}
+ @Override
+ protected void onModelChanged() {
+ super.onModelChanged();
+ input.setModelObject(getModelObject());
+ }
+
@Override
protected void onInitialize() {
super.onInitialize();
@@ -293,7 +299,13 @@ public class MarkdownEditor extends FormComponentPanel<String> {
String callback = ajaxBehavior.getCallbackFunction(explicit("action"), explicit("param1"), explicit("param2"),
explicit("param3")).toString();
- String script = String.format("gitplex.server.markdown.onDomReady('%s', %s, %d, %s, %d, %b, %b, %b);",
+ String autosaveKey = getAutosaveKey();
+ if (autosaveKey != null)
+ autosaveKey = "'" + JavaScriptEscape.escapeJavaScript(autosaveKey) + "'";
+ else
+ autosaveKey = "undefined";
+
+ String script = String.format("gitplex.server.markdown.onDomReady('%s', %s, %d, %s, %d, %b, %b, %b, %s);",
container.getMarkupId(),
callback,
ATWHO_LIMIT,
@@ -301,7 +313,8 @@ public class MarkdownEditor extends FormComponentPanel<String> {
getAttachmentSupport()!=null?getAttachmentSupport().getAttachmentMaxSize():0,
getUserMentionSupport() != null,
getPullRequestReferenceSupport() != null,
- resizable);
+ resizable,
+ autosaveKey);
response.render(OnDomReadyHeaderItem.forScript(script));
script = String.format("gitplex.server.markdown.onWindowLoad('%s');", container.getMarkupId());
@@ -353,4 +366,9 @@ public class MarkdownEditor extends FormComponentPanel<String> {
return null;
}
+ @Nullable
+ protected String getAutosaveKey() {
+ return null;
+ }
+
}
diff --git a/web/src/main/java/com/gitplex/server/web/component/markdown/markdown.css b/web/src/main/java/com/gitplex/server/web/component/markdown/markdown.css
index 42af57622a..d565abff8c 100644
--- a/web/src/main/java/com/gitplex/server/web/component/markdown/markdown.css
+++ b/web/src/main/java/com/gitplex/server/web/component/markdown/markdown.css
@@ -1,3 +1,9 @@
+.markdown-editor>.warning {
+ margin-bottom: 4px;
+ display: none;
+ padding-top: 8px;
+ padding-bottom: 8px;
+}
.markdown-editor>.head {
padding: 8px 0;
}
@@ -16,8 +22,8 @@
.markdown-editor .ui-resizable-handle {
background: #EEE url(hgrabber.png) no-repeat scroll center top;
cursor: s-resize;
- height: 4px;
- bottom: -2px;
+ height: 2px;
+ bottom: -3px;
}
.markdown-editor>.emojis {
diff --git a/web/src/main/java/com/gitplex/server/web/component/markdown/markdown.js b/web/src/main/java/com/gitplex/server/web/component/markdown/markdown.js
index 86b6c69859..120d040951 100644
--- a/web/src/main/java/com/gitplex/server/web/component/markdown/markdown.js
+++ b/web/src/main/java/com/gitplex/server/web/component/markdown/markdown.js
@@ -5,7 +5,7 @@ gitplex.server.markdown = {
else
return "markdownEditor.normalMode";
},
- dispatchInputEvent: function($input) {
+ fireInputEvent: function($input) {
if(document.createEventObject) {
$input[0].fireEvent("input");
} else {
@@ -14,8 +14,57 @@ gitplex.server.markdown = {
$input[0].dispatchEvent(evt);
}
},
+ onSplit: function($container, focus) {
+ var $head = $container.children(".head");
+ var $body = $container.children(".body");
+ var $editLink = $head.find(".edit");
+ var $previewLink = $head.find(".preview");
+ var $splitLink = $head.find(".split");
+ var $edit = $body.children(".edit");
+ var $input = $edit.children("textarea");
+ var $preview = $body.children(".preview");
+ var $rendered = $preview.children(".markdown-rendered");
+
+ $head.find(".pull-left .btn").removeAttr("disabled");
+
+ $edit.show();
+ if (focus)
+ $input.focus();
+
+ $rendered.html("<div class='message'>Loading...</div>");
+ $preview.show();
+ $editLink.removeClass("active");
+ $previewLink.removeClass("active");
+ $splitLink.addClass("active");
+ $container.removeClass("edit-mode").removeClass("preview-mode").addClass("split-mode");
+ gitplex.server.markdown.onLayoutChange($container);
+ $container.data("callback")("render", $input.val());
+ Cookies.set(gitplex.server.markdown.getCookiePrefix($container)+".split", true, {expires: Infinity});
+ },
+ onLayoutChange: function($container) {
+ var $body = $container.children(".body");
+ var $edit = $body.children(".edit");
+ var $input = $edit.children("textarea");
+ var $preview = $body.children(".preview");
+ var $rendered = $preview.children(".markdown-rendered");
+
+ if ($container.hasClass("normal-mode")) {
+ if ($preview.is(":visible") && $edit.is(":visible")) {
+ $preview.css("width", "50%");
+ $edit.css("width", "50%");
+ } else if ($preview.is(":visible")) {
+ $preview.css("width", "100%");
+ } else {
+ $edit.css("width", "100%");
+ }
+ if ($container.hasClass("split-mode")) {
+ $rendered.outerHeight($input.outerHeight());
+ $preview.outerHeight($edit.outerHeight());
+ }
+ }
+ },
onDomReady: function(containerId, callback, atWhoLimit, attachmentSupport, attachmentMaxSize,
- canMentionUser, canReferencePullRequest, resizable) {
+ canMentionUser, canReferencePullRequest, resizable, autosaveKey) {
var $container = $("#" + containerId);
var $head = $container.children(".head");
var $body = $container.children(".body");
@@ -24,15 +73,17 @@ gitplex.server.markdown = {
var $splitLink = $head.find(".split");
var $emojis = $container.children(".emojis");
var $help = $container.children(".help");
+ var $warning = $container.children(".warning");
var $edit = $body.children(".edit");
var $input = $edit.children("textarea");
var $preview = $body.children(".preview");
var $rendered = $preview.children(".markdown-rendered");
+
+ $container.data("callback", callback);
+ $container.data("autosaveKey", autosaveKey);
$head.find(".dropdown>button").dropdown();
- $input.caret(0);
-
$editLink.click(function() {
$head.find(".pull-left .btn").removeAttr("disabled");
@@ -43,11 +94,11 @@ gitplex.server.markdown = {
$previewLink.removeClass("active");
$splitLink.removeClass("active");
$container.removeClass("preview-mode").removeClass("split-mode").addClass("edit-mode");
- onLayoutChange();
+ gitplex.server.markdown.onLayoutChange($container);
Cookies.set(gitplex.server.markdown.getCookiePrefix($container)+".split", false, {expires: Infinity});
});
$previewLink.click(function() {
- $head.find(".pull-left .btn").attr("disabled", "disabled");
+ $head.find(".pull-left .btn").prop("disabled", "disabled");
var caret = $input.caret();
if ($input.val().substring(0, caret).trim().length == 0) {
@@ -70,29 +121,22 @@ gitplex.server.markdown = {
$previewLink.addClass("active");
$splitLink.removeClass("active");
$container.removeClass("edit-mode").removeClass("split-mode").addClass("preview-mode");
- onLayoutChange();
+ gitplex.server.markdown.onLayoutChange($container);
callback("render", $input.val());
});
$splitLink.click(function() {
- $head.find(".pull-left .btn").removeAttr("disabled");
-
- $edit.show();
- $input.focus();
- $rendered.html("<div class='message'>Loading...</div>");
- $preview.show();
- $editLink.removeClass("active");
- $previewLink.removeClass("active");
- $splitLink.addClass("active");
- $container.removeClass("edit-mode").removeClass("preview-mode").addClass("split-mode");
- onLayoutChange();
- callback("render", $input.val());
- Cookies.set(gitplex.server.markdown.getCookiePrefix($container)+".split", true, {expires: Infinity});
+ gitplex.server.markdown.onSplit($container, true);
});
$input.doneEvents("input inserted.atwho", function() {
if ($preview.is(":visible")) {
callback("render", $input.val());
}
+ if (autosaveKey) {
+ var content = $input.val();
+ if (content.trim().length != 0)
+ localStorage.setItem(autosaveKey, content);
+ }
}, 500);
$input.doneEvents("keydown", function(e) {
@@ -140,7 +184,7 @@ gitplex.server.markdown = {
$input.scrollTop(caretBottom - $input.height());
}
- gitplex.server.markdown.dispatchInputEvent($input);
+ gitplex.server.markdown.fireInputEvent($input);
}
});
@@ -186,10 +230,16 @@ gitplex.server.markdown = {
}
});
} else {
+ $warning.on("closed.bs.alert", function () {
+ $(window).resize();
+ })
+
$container.find(".ui-resizable-handle").hide();
$container.on("autofit", function(e, width, height) {
height -= $head.outerHeight();
+ if ($warning.is(":visible"))
+ height -= $warning.outerHeight(true);
if ($emojis.is(":visible"))
height -= $emojis.outerHeight();
if ($help.is(":visible"))
@@ -202,23 +252,6 @@ gitplex.server.markdown = {
});
}
- function onLayoutChange() {
- if ($container.hasClass("normal-mode")) {
- if ($preview.is(":visible") && $edit.is(":visible")) {
- $preview.css("width", "50%");
- $edit.css("width", "50%");
- } else if ($preview.is(":visible")) {
- $preview.css("width", "100%");
- } else {
- $edit.css("width", "100%");
- }
- if ($container.hasClass("split-mode")) {
- $rendered.outerHeight($input.outerHeight());
- $preview.outerHeight($edit.outerHeight());
- }
- }
- }
-
function onSelectUrl(isImage) {
var $modal = $("" +
"<div class='modal'>" +
@@ -257,7 +290,7 @@ gitplex.server.markdown = {
$input.range("**strong text**").range(selected.start+2, selected.end+2+"strong text".length);
}
$input.focus();
- gitplex.server.markdown.dispatchInputEvent($input);
+ gitplex.server.markdown.fireInputEvent($input);
});
$head.find(".do-italic").click(function() {
@@ -268,7 +301,7 @@ gitplex.server.markdown = {
$input.range("_emphasized text_").range(selected.start+1, selected.end+1+"emphasized text".length);
}
$input.focus();
- gitplex.server.markdown.dispatchInputEvent($input);
+ gitplex.server.markdown.fireInputEvent($input);
});
$head.find(".do-header").click(function() {
@@ -279,7 +312,7 @@ gitplex.server.markdown = {
$input.range("### heading text").range(selected.start+4, selected.end+4+"heading text".length);
}
$input.focus();
- gitplex.server.markdown.dispatchInputEvent($input);
+ gitplex.server.markdown.fireInputEvent($input);
});
$head.find(".do-list, .do-orderlist").click(function() {
@@ -298,7 +331,7 @@ gitplex.server.markdown = {
$input.range(leading + " list text here").range(selected.start+leading.length+1, selected.start+leading.length+1+"list text here".length);
}
$input.focus();
- gitplex.server.markdown.dispatchInputEvent($input);
+ gitplex.server.markdown.fireInputEvent($input);
});
$head.find(".do-code").click(function() {
@@ -316,7 +349,7 @@ gitplex.server.markdown = {
$input.range("`code text here`").range(selected.start+1, selected.end+1+"code text here".length);
}
$input.focus();
- gitplex.server.markdown.dispatchInputEvent($input);
+ gitplex.server.markdown.fireInputEvent($input);
});
$head.find(".do-quote").click(function() {
@@ -326,7 +359,7 @@ gitplex.server.markdown = {
else
$input.range("> quote here").range(selected.start+2, selected.start+2+"quote here".length);
$input.focus();
- gitplex.server.markdown.dispatchInputEvent($input);
+ gitplex.server.markdown.fireInputEvent($input);
});
$head.find(".do-emoji").click(function() {
@@ -362,7 +395,7 @@ gitplex.server.markdown = {
$input.caret(" " + atChar);
}
$input.atwho("run");
- gitplex.server.markdown.dispatchInputEvent($input);
+ gitplex.server.markdown.fireInputEvent($input);
});
$head.find(".do-image, .do-link").click(function() {
@@ -580,6 +613,7 @@ gitplex.server.markdown = {
var $container = $("#" + containerId);
var $head = $container.children(".head");
var $body = $container.children(".body");
+ var $warning = $container.children(".warning");
var $rendered = $body.find(">.preview>.markdown-rendered");
var $input = $body.find(">.edit>textarea");
@@ -595,8 +629,23 @@ gitplex.server.markdown = {
$rendered.outerHeight($input.outerHeight());
}
}
- if (Cookies.get(gitplex.server.markdown.getCookiePrefix($container)+".split") === "true")
- $head.find(".split").trigger("click");
+
+ var autosaveKey = $container.data("autosaveKey");
+ if (autosaveKey) {
+ gitplex.server.form.registerAutosaveKey($container.closest("form.leave-confirm"), autosaveKey);
+ var autosaveValue = localStorage.getItem(autosaveKey);
+ if (autosaveValue) {
+ $input.val(autosaveValue);
+ $warning.show();
+ gitplex.server.markdown.fireInputEvent($input);
+ }
+ }
+ if ($input.is(":focus"))
+ $input.caret(0);
+
+ if (Cookies.get(gitplex.server.markdown.getCookiePrefix($container)+".split") === "true") {
+ gitplex.server.markdown.onSplit($container, false);
+ }
},
onRendered: function(containerId, html) {
var $preview = $("#" + containerId + ">.body>.preview");
@@ -689,7 +738,7 @@ gitplex.server.markdown = {
return;
$input.caret(":" + $(this).attr("title") + ": ");
- gitplex.server.markdown.dispatchInputEvent($input);
+ gitplex.server.markdown.fireInputEvent($input);
});
$(window).resize();
},
@@ -715,7 +764,7 @@ gitplex.server.markdown = {
$input.range($input.caret()-message.length+offset, $input.caret()-message.length+defaultDescription.length+offset);
}
- gitplex.server.markdown.dispatchInputEvent($input);
+ gitplex.server.markdown.fireInputEvent($input);
},
updateUploadMessage: function($input, message, replaceMessage) {
var isError = message.indexOf("!!") == 0;
diff --git a/web/src/main/java/com/gitplex/server/web/component/revisionpicker/CreateTagPanel.html b/web/src/main/java/com/gitplex/server/web/component/revisionpicker/CreateTagPanel.html
index 7a8215d083..4bf12bf8c1 100644
--- a/web/src/main/java/com/gitplex/server/web/component/revisionpicker/CreateTagPanel.html
+++ b/web/src/main/java/com/gitplex/server/web/component/revisionpicker/CreateTagPanel.html
@@ -4,7 +4,7 @@
<h4 class="modal-title">Specify Tag Message</h4>
</div>
<div class="modal-body">
- <textarea wicket:id="message" rows="10" class="form-control focusable"></textarea>
+ <textarea wicket:id="message" rows="10" class="form-control autofocus"></textarea>
</div>
<div class="modal-footer">
<div class="form-group">
diff --git a/web/src/main/java/com/gitplex/server/web/editable/branchmatch/BranchMatchEditor.html b/web/src/main/java/com/gitplex/server/web/editable/branchmatch/BranchMatchEditor.html
index 684bf7b550..0334e8b15c 100644
--- a/web/src/main/java/com/gitplex/server/web/editable/branchmatch/BranchMatchEditor.html
+++ b/web/src/main/java/com/gitplex/server/web/editable/branchmatch/BranchMatchEditor.html
@@ -1,3 +1,3 @@
<wicket:panel>
- <input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control focusable"></input>
+ <input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control autofocus"></input>
</wicket:panel>
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/editable/date/DatePropertyEditor.html b/web/src/main/java/com/gitplex/server/web/editable/date/DatePropertyEditor.html
index 464f9b8f5f..00478ee0e3 100644
--- a/web/src/main/java/com/gitplex/server/web/editable/date/DatePropertyEditor.html
+++ b/web/src/main/java/com/gitplex/server/web/editable/date/DatePropertyEditor.html
@@ -1,3 +1,3 @@
<wicket:panel>
- <input wicket:id="input" type="text" class="form-control focusable"></input>
+ <input wicket:id="input" type="text" class="form-control autofocus"></input>
</wicket:panel>
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/editable/filechoice/FileChoiceEditor.html b/web/src/main/java/com/gitplex/server/web/editable/filechoice/FileChoiceEditor.html
index 3d9168eeba..2206db9051 100644
--- a/web/src/main/java/com/gitplex/server/web/editable/filechoice/FileChoiceEditor.html
+++ b/web/src/main/java/com/gitplex/server/web/editable/filechoice/FileChoiceEditor.html
@@ -1,3 +1,3 @@
<wicket:panel>
- <input wicket:id="input" autocomplete="off" spellcheck="false" class="focusable form-control"></input>
+ <input wicket:id="input" autocomplete="off" spellcheck="false" class="autofocus form-control"></input>
</wicket:panel>
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/editable/fullbranchmatch/FullBranchMatchEditor.html b/web/src/main/java/com/gitplex/server/web/editable/fullbranchmatch/FullBranchMatchEditor.html
index 684bf7b550..0334e8b15c 100644
--- a/web/src/main/java/com/gitplex/server/web/editable/fullbranchmatch/FullBranchMatchEditor.html
+++ b/web/src/main/java/com/gitplex/server/web/editable/fullbranchmatch/FullBranchMatchEditor.html
@@ -1,3 +1,3 @@
<wicket:panel>
- <input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control focusable"></input>
+ <input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control autofocus"></input>
</wicket:panel>
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/editable/list/polymorphic/PolymorphicListPropertyEditor.html b/web/src/main/java/com/gitplex/server/web/editable/list/polymorphic/PolymorphicListPropertyEditor.html
index 868101e802..403541e93a 100644
--- a/web/src/main/java/com/gitplex/server/web/editable/list/polymorphic/PolymorphicListPropertyEditor.html
+++ b/web/src/main/java/com/gitplex/server/web/editable/list/polymorphic/PolymorphicListPropertyEditor.html
@@ -19,7 +19,7 @@
</table>
<wicket:fragment wicket:id="horizontalFrag">
<td class="type-selector">
- <select wicket:id="elementTypeSelector" class="form-control focusable"></select>
+ <select wicket:id="elementTypeSelector" class="form-control autofocus"></select>
</td>
<td>
<div wicket:id="elementEditor"></div>
@@ -33,7 +33,7 @@
<wicket:fragment wicket:id="verticalFrag">
<td>
<div class="type-selector">
- <select wicket:id="elementTypeSelector" class="form-control focusable"></select>
+ <select wicket:id="elementTypeSelector" class="form-control autofocus"></select>
</div>
<div wicket:id="elementEditor"></div>
<div wicket:id="feedback"></div>
diff --git a/web/src/main/java/com/gitplex/server/web/editable/numeric/NumericPropertyEditor.html b/web/src/main/java/com/gitplex/server/web/editable/numeric/NumericPropertyEditor.html
index 464f9b8f5f..00478ee0e3 100644
--- a/web/src/main/java/com/gitplex/server/web/editable/numeric/NumericPropertyEditor.html
+++ b/web/src/main/java/com/gitplex/server/web/editable/numeric/NumericPropertyEditor.html
@@ -1,3 +1,3 @@
<wicket:panel>
- <input wicket:id="input" type="text" class="form-control focusable"></input>
+ <input wicket:id="input" type="text" class="form-control autofocus"></input>
</wicket:panel>
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/editable/password/PasswordPropertyEditor.html b/web/src/main/java/com/gitplex/server/web/editable/password/PasswordPropertyEditor.html
index 5039c6bcb1..cb9a278dfa 100644
--- a/web/src/main/java/com/gitplex/server/web/editable/password/PasswordPropertyEditor.html
+++ b/web/src/main/java/com/gitplex/server/web/editable/password/PasswordPropertyEditor.html
@@ -1,3 +1,3 @@
<wicket:panel>
- <input wicket:id="input" type="password" autocomplete="new-password" class="form-control focusable"></input>
+ <input wicket:id="input" type="password" autocomplete="new-password" class="form-control autofocus"></input>
</wicket:panel>
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/editable/pathmatch/PathMatchEditor.html b/web/src/main/java/com/gitplex/server/web/editable/pathmatch/PathMatchEditor.html
index 684bf7b550..0334e8b15c 100644
--- a/web/src/main/java/com/gitplex/server/web/editable/pathmatch/PathMatchEditor.html
+++ b/web/src/main/java/com/gitplex/server/web/editable/pathmatch/PathMatchEditor.html
@@ -1,3 +1,3 @@
<wicket:panel>
- <input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control focusable"></input>
+ <input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control autofocus"></input>
</wicket:panel>
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/editable/polymorphic/PolymorphicPropertyEditor.html b/web/src/main/java/com/gitplex/server/web/editable/polymorphic/PolymorphicPropertyEditor.html
index 2e6f85dfb5..c8fc6892e5 100644
--- a/web/src/main/java/com/gitplex/server/web/editable/polymorphic/PolymorphicPropertyEditor.html
+++ b/web/src/main/java/com/gitplex/server/web/editable/polymorphic/PolymorphicPropertyEditor.html
@@ -2,7 +2,7 @@
<div wicket:id="content" class="polymorphic"></div>
<wicket:fragment wicket:id="verticalFrag">
<div wicket:id="typeSelectorContainer" class="type-selector">
- <select wicket:id="typeSelector" class="form-control focusable"></select>
+ <select wicket:id="typeSelector" class="form-control autofocus"></select>
</div>
<div wicket:id="beanEditor"></div>
</wicket:fragment>
@@ -10,7 +10,7 @@
<table>
<tbody>
<tr>
- <td wicket:id="typeSelectorContainer" class="type-selector"><select wicket:id="typeSelector" class="form-control focusable"></select></td>
+ <td wicket:id="typeSelectorContainer" class="type-selector"><select wicket:id="typeSelector" class="form-control autofocus"></select></td>
<td><div wicket:id="beanEditor"></div></td>
</tr>
</tbody>
diff --git a/web/src/main/java/com/gitplex/server/web/editable/refmatch/RefMatchEditor.html b/web/src/main/java/com/gitplex/server/web/editable/refmatch/RefMatchEditor.html
index 684bf7b550..0334e8b15c 100644
--- a/web/src/main/java/com/gitplex/server/web/editable/refmatch/RefMatchEditor.html
+++ b/web/src/main/java/com/gitplex/server/web/editable/refmatch/RefMatchEditor.html
@@ -1,3 +1,3 @@
<wicket:panel>
- <input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control focusable"></input>
+ <input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control autofocus"></input>
</wicket:panel>
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/editable/string/StringPropertyEditor.html b/web/src/main/java/com/gitplex/server/web/editable/string/StringPropertyEditor.html
index 3fe59abd7b..10b1aec49a 100644
--- a/web/src/main/java/com/gitplex/server/web/editable/string/StringPropertyEditor.html
+++ b/web/src/main/java/com/gitplex/server/web/editable/string/StringPropertyEditor.html
@@ -1,10 +1,10 @@
<wicket:panel>
<div wicket:id="content"></div>
<wicket:fragment wicket:id="singleLineFrag">
- <input wicket:id="input" type="text" class="form-control focusable"></input>
+ <input wicket:id="input" type="text" class="form-control autofocus"></input>
</wicket:fragment>
<wicket:fragment wicket:id="multiLineFrag">
- <textarea wicket:id="input" class="form-control focusable" rows="4"></textarea>
+ <textarea wicket:id="input" class="form-control autofocus" rows="4"></textarea>
</wicket:fragment>
<wicket:fragment wicket:id="markdownFrag">
<div wicket:id="input"></div>
diff --git a/web/src/main/java/com/gitplex/server/web/page/base/BasePage.java b/web/src/main/java/com/gitplex/server/web/page/base/BasePage.java
index be9ff0419b..49c1900637 100644
--- a/web/src/main/java/com/gitplex/server/web/page/base/BasePage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/base/BasePage.java
@@ -34,6 +34,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.resource.PackageResourceReference;
import org.apache.wicket.util.time.Duration;
import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.unbescape.javascript.JavaScriptEscape;
import com.gitplex.launcher.loader.AppLoader;
import com.gitplex.server.GitPlex;
@@ -49,6 +50,8 @@ import com.gitplex.server.web.websocket.WebSocketRegion;
@SuppressWarnings("serial")
public abstract class BasePage extends WebPage {
+ public static final String PARAM_AUTOSAVE_KEY_TO_CLEAR = "autosaveKeyToClear";
+
private FeedbackPanel sessionFeedback;
private RepeatingView rootComponents;
@@ -80,7 +83,14 @@ public abstract class BasePage extends WebPage {
* including onDomReady and onWindowLoad call
*/
response.render(JavaScriptHeaderItem.forReference(new BaseResourceReference()));
- response.render(OnDomReadyHeaderItem.forScript("gitplex.server.onDomReady();"));
+
+ String autosaveKeyToClear = getPageParameters().get(PARAM_AUTOSAVE_KEY_TO_CLEAR).toString();
+ if (autosaveKeyToClear != null)
+ autosaveKeyToClear = "'" + JavaScriptEscape.escapeJavaScript(autosaveKeyToClear) + "'";
+ else
+ autosaveKeyToClear = "undefined";
+ response.render(OnDomReadyHeaderItem.forScript(String.format("gitplex.server.onDomReady(%s);",
+ autosaveKeyToClear)));
response.render(OnLoadHeaderItem.forScript("gitplex.server.onWindowLoad();"));
}
diff --git a/web/src/main/java/com/gitplex/server/web/page/base/base.css b/web/src/main/java/com/gitplex/server/web/page/base/base.css
index 3f697d76af..1e4558a4e5 100644
--- a/web/src/main/java/com/gitplex/server/web/page/base/base.css
+++ b/web/src/main/java/com/gitplex/server/web/page/base/base.css
@@ -393,6 +393,9 @@ table.table>thead>tr>th>a {
text-decoration: underline;
}
+textarea {
+ resize: none;
+}
form>.actions {
margin-top: 20px;
}
diff --git a/web/src/main/java/com/gitplex/server/web/page/base/base.js b/web/src/main/java/com/gitplex/server/web/page/base/base.js
index 410dfdc1ae..0fae1bb74c 100644
--- a/web/src/main/java/com/gitplex/server/web/page/base/base.js
+++ b/web/src/main/java/com/gitplex/server/web/page/base/base.js
@@ -201,11 +201,27 @@ gitplex.server = {
$container = $("#" + containerId);
else
$container = $(document);
- var dirty = "form.leave-confirm.dirty";
- if ($container.is(dirty) || $container.find(dirty).length != 0)
- return confirm("There are unsaved changes, do you want to discard and continue?");
- else
+ var selector = "form.leave-confirm.dirty";
+ var $dirtyForms = $container.find(selector).addBack(selector);
+ if ($dirtyForms.length != 0) {
+ if (confirm("There are unsaved changes, do you want to discard and continue?")) {
+ gitplex.server.form.clearAutosavings($dirtyForms);
+ } else {
+ return false;
+ }
+ } else {
return true;
+ }
+ },
+ clearAutosavings: function($dirtyForms) {
+ $dirtyForms.each(function() {
+ var autosaveKey = $(this).data("autosaveKey");
+ if (autosaveKey)
+ localStorage.removeItem(autosaveKey);
+ });
+ },
+ registerAutosaveKey: function($form, autosaveKey) {
+ $form.data("autosaveKey", autosaveKey);
}
},
setupAutoSize: function() {
@@ -262,13 +278,15 @@ gitplex.server = {
},
doFocus: function($containers) {
- var $inError = $containers.find(".has-error:first .focusable");
- if ($inError.length != 0) {
+ var selector = ".has-error:visible:first .autofocus";
+ var $inError = $containers.find(selector).addBack(selector);
+ if ($inError.length != 0 && $inError.closest(".no-autofocus").length == 0) {
$inError.focus();
} else {
- $containers.find(".focusable:visible").each(function() {
+ selector = ".autofocus:visible";
+ $containers.find(selector).addBack(selector).each(function() {
var $this = $(this);
- if ($this.parents(".nofocus").length == 0) {
+ if ($this.closest(".no-autofocus").length == 0) {
$this.focus();
return false;
}
@@ -531,17 +549,24 @@ gitplex.server = {
}
},
- onDomReady: function() {
+ onDomReady: function(autosaveKeyToClear) {
gitplex.server.setupAjaxLoadingIndicator();
gitplex.server.form.setupDirtyCheck();
gitplex.server.focus.setupAutoFocus();
gitplex.server.setupWebsocketCallback();
gitplex.server.mouseState.track();
+ if (autosaveKeyToClear)
+ localStorage.removeItem(autosaveKeyToClear);
+
$(document).keydown(function(e) {
if (e.keyCode == 27)
e.preventDefault();
});
+
+ window.onunload = function() {
+ gitplex.server.form.clearAutosavings($("form.leave-confirm.dirty"));
+ };
},
onWindowLoad: function() {
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/DepotBlobPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/DepotBlobPage.java
index 97bdb3dea5..196bc456c4 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/DepotBlobPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/DepotBlobPage.java
@@ -131,6 +131,10 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {
if (getDepot().getDefaultBranch() == null)
throw new RestartResponseException(NoBranchesPage.class, paramsOf(getDepot()));
+ String modeStr = params.get(PARAM_MODE).toString();
+ if (modeStr != null)
+ state.mode = Mode.valueOf(modeStr.toUpperCase());
+
List<String> revisionAndPathSegments = new ArrayList<>();
String segment = params.get(PARAM_REVISION).toString();
if (segment != null && segment.length() != 0)
@@ -145,7 +149,17 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {
revisionAndPathSegments.add(segment);
}
- state.blobIdent = new BlobIdent(getDepot(), revisionAndPathSegments);
+ if (state.mode == Mode.ADD) {
+ /*
+ * In add mode, the url has a suffix "/newfile" which is added in order to
+ * make relative path referencing in markdown working, and here we need to
+ * trim it off to get the real blob path
+ */
+ state.blobIdent = new BlobIdent(getDepot(),
+ revisionAndPathSegments.subList(0, revisionAndPathSegments.size()-1));
+ } else {
+ state.blobIdent = new BlobIdent(getDepot(), revisionAndPathSegments);
+ }
if (state.blobIdent.revision == null)
state.blobIdent.revision = getDepot().getDefaultBranch();
@@ -170,10 +184,6 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {
state.blobIdent.mode = FileMode.TREE.getBits();
}
- String modeStr = params.get(PARAM_MODE).toString();
- if (modeStr != null)
- state.mode = Mode.valueOf(modeStr.toUpperCase());
-
state.mark = TextRange.of(params.get(PARAM_MARK).toString());
state.anchor = params.get(PARAM_ANCHOR).toString();
@@ -979,6 +989,7 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {
onResolvedRevisionChange(target);
pushState(target);
} else {
+ state.mode = Mode.VIEW;
onResolvedRevisionChange(target);
}
@@ -1001,5 +1012,19 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {
resolvedRevision = revisionResolveEvent.getResolvedRevision();
}
}
-
+
+ @Override
+ public String getAutosaveKey() {
+ if (state.mode == Mode.ADD) {
+ return String.format("autosave:addBlob:%d:%s:%s",
+ getDepot().getId(), state.blobIdent.revision, getNewPath());
+ } else if (state.mode == Mode.EDIT) {
+ return String.format("autosave:editBlob:%d:%s:%s:%s",
+ getDepot().getId(), state.blobIdent.revision,
+ state.blobIdent.path, getDepot().getBlob(state.blobIdent).getBlobId());
+ } else {
+ throw new IllegalStateException();
+ }
+ }
+
}
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/navigator/BlobNavigator.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/navigator/BlobNavigator.java
index 206f01ec53..123911111f 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/navigator/BlobNavigator.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/navigator/BlobNavigator.java
@@ -273,7 +273,7 @@ public class BlobNavigator extends Panel {
});
if (context.getMode() == Mode.ADD)
- nameInput.add(AttributeAppender.append("class", "focusable"));
+ nameInput.add(AttributeAppender.append("class", "autofocus"));
lastSegment.add(AttributeAppender.append("class", "input"));
} else if (file.isTree()) {
lastSegment = new WebMarkupContainer(LAST_SEGMENT_ID);
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/BlobRenderContext.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/BlobRenderContext.java
index 5a1de78cec..071804da60 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/BlobRenderContext.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/BlobRenderContext.java
@@ -66,4 +66,5 @@ public interface BlobRenderContext extends Serializable {
@Nullable
String getNewPath();
+ String getAutosaveKey();
}
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/commitoption/CommitOptionPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/commitoption/CommitOptionPanel.java
index 50d0edf37e..f07554b48c 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/commitoption/CommitOptionPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/commitoption/CommitOptionPanel.java
@@ -85,6 +85,8 @@ public class CommitOptionPanel extends Panel {
private Set<String> oldPaths;
+ private String autosaveKey;
+
public CommitOptionPanel(String id, BlobRenderContext context, @Nullable Provider<byte[]> newContentProvider) {
super(id);
@@ -95,6 +97,8 @@ public class CommitOptionPanel extends Panel {
String oldPath = getOldPath();
if (oldPath != null)
oldPaths.add(oldPath);
+
+ autosaveKey = context.getAutosaveKey();
}
@Nullable
@@ -376,6 +380,7 @@ public class CommitOptionPanel extends Panel {
}
if (newCommitId != null) {
context.onCommitted(target, prevCommitId, newCommitId);
+ target.appendJavaScript(String.format("localStorage.removeItem('%s');", autosaveKey));
return true;
} else {
newChangedContainer(target);
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/edit/BlobEditPanel.html b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/edit/BlobEditPanel.html
index 2c22827e68..2b10a66d0b 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/edit/BlobEditPanel.html
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/edit/BlobEditPanel.html
@@ -2,7 +2,7 @@
<div class="blob-edit autofit">
<div class="head clearfix">
<div class="pull-left active tab edit"><a><i class="fa fa-pencil"></i> Edit file</a></div>
- <div class="pull-left save tab"><a><i class="fa fa-floppy-o"></i> Save</a></div>
+ <div wicket:id="saveTab" class="pull-left save tab"><a><i class="fa fa-floppy-o"></i> Save</a></div>
<div class="pull-left cancel"><a wicket:id="cancelLink" tabindex="-1">Cancel</a></div>
<div wicket:id="editOptions" class="options pull-right"></div>
</div>
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/edit/BlobEditPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/edit/BlobEditPanel.java
index 1807c8beb3..c2a009279d 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/edit/BlobEditPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/edit/BlobEditPanel.java
@@ -44,6 +44,9 @@ public abstract class BlobEditPanel extends Panel {
protected void onInitialize() {
super.onInitialize();
+ add(new WebMarkupContainer("saveTab")
+ .setVisible(context.getMode() != Mode.ADD || context.getNewPath() != null));
+
add(new ViewStateAwareAjaxLink<Void>("cancelLink", true) {
@Override
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownBlobEditPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownBlobEditPanel.java
index d260e77869..fadfc26569 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownBlobEditPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownBlobEditPanel.java
@@ -44,7 +44,12 @@ public class MarkdownBlobEditPanel extends BlobEditPanel {
};
}
-
+
+ @Override
+ protected String getAutosaveKey() {
+ return context.getAutosaveKey();
+ }
+
};
}
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownBlobEditor.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownBlobEditor.java
index 5c628b0810..431684b1df 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownBlobEditor.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownBlobEditor.java
@@ -1,5 +1,6 @@
package com.gitplex.server.web.page.depot.blob.render.renderers.markdown;
+import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.markup.html.form.FormComponentPanel;
@@ -31,8 +32,16 @@ abstract class MarkdownBlobEditor extends FormComponentPanel<byte[]> {
protected BlobReferenceSupport getBlobReferenceSupport() {
return MarkdownBlobEditor.this.getBlobReferenceSupport();
}
+
+ @Override
+ protected String getAutosaveKey() {
+ return MarkdownBlobEditor.this.getAutosaveKey();
+ }
});
+ if (!autoFocus) {
+ input.add(AttributeAppender.append("class", "no-autofocus"));
+ }
input.setOutputMarkupId(true);
}
@@ -55,4 +64,7 @@ abstract class MarkdownBlobEditor extends FormComponentPanel<byte[]> {
}
protected abstract BlobReferenceSupport getBlobReferenceSupport();
+
+ protected abstract String getAutosaveKey();
+
}
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/markdown-blob.css b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/markdown-blob.css
index f51ca49b3e..3f646f136a 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/markdown-blob.css
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/markdown-blob.css
@@ -8,6 +8,10 @@
.blob-edit .markdown-editor>.head {
padding: 8px;
}
+.blob-edit .markdown-editor>.emojis, .blob-edit .markdown-editor>.help {
+ padding-left: 8px;
+ padding-right: 8px;
+}
.blob-edit .markdown-editor>.body>.edit>textarea,
.blob-edit .markdown-editor>.body>.preview>.markdown-rendered {
border-radius: 0 !important;
@@ -24,8 +28,6 @@
border-bottom: none;
border-left: none;
}
-.blob-edit .markdown-editor>.body>.edit>textarea {
- min-height: none;
- max-height: none;
- resize: none;
+.blob-edit .markdown-editor>.warning {
+ margin: 12px 8px 4px 8px;
}
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/noname/NoNameCssResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/noname/NoNameCssResourceReference.java
new file mode 100644
index 0000000000..f09c735ce8
--- /dev/null
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/noname/NoNameCssResourceReference.java
@@ -0,0 +1,12 @@
+package com.gitplex.server.web.page.depot.blob.render.renderers.noname;
+
+import com.gitplex.server.web.page.base.BaseDependentCssResourceReference;
+
+@SuppressWarnings("serial")
+public class NoNameCssResourceReference extends BaseDependentCssResourceReference {
+
+ public NoNameCssResourceReference() {
+ super(NoNameCssResourceReference.class, "no-name.css");
+ }
+
+}
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/noname/NoNameEditPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/noname/NoNameEditPanel.java
new file mode 100644
index 0000000000..dc2f6dbfb1
--- /dev/null
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/noname/NoNameEditPanel.java
@@ -0,0 +1,28 @@
+package com.gitplex.server.web.page.depot.blob.render.renderers.noname;
+
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.html.form.FormComponentPanel;
+
+import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext;
+import com.gitplex.server.web.page.depot.blob.render.edit.BlobEditPanel;
+
+@SuppressWarnings("serial")
+public class NoNameEditPanel extends BlobEditPanel {
+
+ public NoNameEditPanel(String id, BlobRenderContext context) {
+ super(id, context);
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(CssHeaderItem.forReference(new NoNameCssResourceReference()));
+ }
+
+ @Override
+ protected FormComponentPanel<byte[]> newContentEditor(String componentId, byte[] initialContent) {
+ return new NoNameFormComponent(componentId);
+ }
+
+}
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/noname/NoNameFormComponent.html b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/noname/NoNameFormComponent.html
new file mode 100644
index 0000000000..7ef8ec438a
--- /dev/null
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/noname/NoNameFormComponent.html
@@ -0,0 +1,6 @@
+<wicket:panel>
+ <div class="no-name alert alert-warning">
+ <i class="fa fa-warning"></i>
+ Please specify file name above before editing content
+ </div>
+</wicket:panel>
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/noname/NoNameFormComponent.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/noname/NoNameFormComponent.java
new file mode 100644
index 0000000000..ef948458c4
--- /dev/null
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/noname/NoNameFormComponent.java
@@ -0,0 +1,12 @@
+package com.gitplex.server.web.page.depot.blob.render.renderers.noname;
+
+import org.apache.wicket.markup.html.form.FormComponentPanel;
+
+@SuppressWarnings("serial")
+class NoNameFormComponent extends FormComponentPanel<byte[]> {
+
+ public NoNameFormComponent(String id) {
+ super(id);
+ }
+
+}
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/noname/NoNameRendererProvider.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/noname/NoNameRendererProvider.java
new file mode 100644
index 0000000000..28ccdb59f3
--- /dev/null
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/noname/NoNameRendererProvider.java
@@ -0,0 +1,36 @@
+package com.gitplex.server.web.page.depot.blob.render.renderers.noname;
+
+import org.apache.wicket.Component;
+
+import com.gitplex.server.web.PrioritizedComponentRenderer;
+import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext;
+import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext.Mode;
+import com.gitplex.server.web.page.depot.blob.render.BlobRendererContribution;
+
+public class NoNameRendererProvider implements BlobRendererContribution {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public PrioritizedComponentRenderer getRenderer(BlobRenderContext context) {
+ if (context.getMode() == Mode.ADD && context.getNewPath() == null) {
+ return new PrioritizedComponentRenderer() {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public Component render(String componentId) {
+ return new NoNameEditPanel(componentId, context);
+ }
+
+ @Override
+ public int getPriority() {
+ return 0;
+ }
+ };
+ } else {
+ return null;
+ }
+ }
+
+}
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/noname/no-name.css b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/noname/no-name.css
new file mode 100644
index 0000000000..e1416acc1a
--- /dev/null
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/noname/no-name.css
@@ -0,0 +1,3 @@
+.blob-content .no-name {
+ margin: 20px;
+}
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceEditPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceEditPanel.java
index e569e4d95e..d20357d031 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceEditPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceEditPanel.java
@@ -138,20 +138,22 @@ public class SourceEditPanel extends BlobEditPanel implements MarkSupport {
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
response.render(JavaScriptHeaderItem.forReference(new SourceEditResourceReference()));
-
+
+ String autosaveKey = JavaScriptEscape.escapeJavaScript(context.getAutosaveKey());
String jsonOfMark = context.getMark()!=null?getJson(context.getMark()):"undefined";
- String script = String.format("gitplex.server.sourceEdit.onDomReady('%s', '%s', %s, '%s', %s, '%s', %b);",
+ String script = String.format("gitplex.server.sourceEdit.onDomReady('%s', '%s', %s, '%s', %s, '%s', %b, '%s');",
sourceFormComponent.getMarkupId(),
JavaScriptEscape.escapeJavaScript(context.getNewPath()),
jsonOfMark,
sourceFormat.getIndentType(),
sourceFormat.getTabSize(),
sourceFormat.getLineWrapMode(),
- context.getMode() == Mode.EDIT);
+ context.getMode() == Mode.EDIT,
+ autosaveKey);
response.render(OnDomReadyHeaderItem.forScript(script));
- script = String.format("gitplex.server.sourceEdit.onWindowLoad('%s', %s);",
- sourceFormComponent.getMarkupId(), jsonOfMark);
+ script = String.format("gitplex.server.sourceEdit.onWindowLoad('%s', %s, '%s');",
+ sourceFormComponent.getMarkupId(), jsonOfMark, autosaveKey);
response.render(OnLoadHeaderItem.forScript(script));
}
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceFormComponent.html b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceFormComponent.html
index 21f3d7dec8..ebac92e00c 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceFormComponent.html
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceFormComponent.html
@@ -1,5 +1,9 @@
<wicket:panel>
<div class="source-edit autofit">
+ <div class="warning alert alert-warning">
+ <button class="close" data-dismiss="alert"><span>&times;</span></button>
+ <div class="message"><i class="fa fa-warning"></i> Below content is restored from an unsaved change</div>
+ </div>
<div class="code"></div>
<textarea wicket:id="input" class="input"></textarea>
</div>
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewPanel.java
index c584d13b23..21c979a8e3 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewPanel.java
@@ -445,6 +445,8 @@ public class SourceViewPanel extends BlobViewPanel implements MarkSupport {
String uuid = UUID.randomUUID().toString();
+ String autosaveKey = "autosave:addCodeCommentOnSource:" + context.getDepot().getId()
+ + ":" + context.getBlobIdent().path;
CommentInput contentInput;
form.add(contentInput = new CommentInput("content", Model.of(""), true) {
@@ -453,6 +455,11 @@ public class SourceViewPanel extends BlobViewPanel implements MarkSupport {
return new DepotAttachmentSupport(context.getDepot(), uuid);
}
+ @Override
+ protected String getAutosaveKey() {
+ return autosaveKey;
+ }
+
@Override
protected Depot getDepot() {
return context.getDepot();
@@ -534,9 +541,13 @@ public class SourceViewPanel extends BlobViewPanel implements MarkSupport {
commentContainer.replace(commentPanel);
target.add(commentContainer);
- String script = String.format("gitplex.server.sourceView.onCommentAdded(%s);",
- getJsonOfComment(comment));
+ String script = String.format(""
+ + "gitplex.server.sourceView.onCommentAdded(%s);"
+ + "localStorage.removeItem('%s');",
+ getJsonOfComment(comment),
+ autosaveKey);
target.appendJavaScript(script);
+
context.onCommentOpened(target, comment);
}
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-edit.css b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-edit.css
index 115e686402..22bfb77d85 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-edit.css
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-edit.css
@@ -3,4 +3,14 @@
}
.blob-edit .source-edit .input {
display: none;
+}
+.blob-edit .source-edit .warning {
+ border-radius: 0;
+ margin: 0;
+ border-left: none;
+ border-top: none;
+ border-right: none;
+ padding-top: 8px;
+ padding-bottom: 8px;
+ display: none;
}
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-edit.js b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-edit.js
index 436f8337bb..c01035efca 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-edit.js
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-edit.js
@@ -1,7 +1,9 @@
gitplex.server.sourceEdit = {
- onDomReady: function(containerId, filePath, mark, indentType, tabSize, lineWrapMode, autoFocus) {
+ onDomReady: function(containerId, filePath, mark, indentType, tabSize, lineWrapMode,
+ autoFocus, autosaveKey) {
var $container = $("#" + containerId);
var $sourceEdit = $container.children(".source-edit");
+ var $warning = $sourceEdit.children(".warning");
var $code = $sourceEdit.children(".code");
var cm = CodeMirror($code[0], {
@@ -39,8 +41,16 @@ gitplex.server.sourceEdit = {
gitplex.server.codemirror.bindKeys(cm);
+ var doneTimer;
cm.on("change", function() {
$sourceEdit.closest("form").addClass("dirty");
+ if (doneTimer)
+ clearTimeout(doneTimer);
+ doneTimer = setTimeout(function() {
+ var content = cm.doc.getValue();
+ if (content.trim().length != 0)
+ localStorage.setItem(autosaveKey, content);
+ }, 500);
});
$sourceEdit.on("getViewState", function(e) {
@@ -56,13 +66,26 @@ gitplex.server.sourceEdit = {
$sourceEdit.outerWidth(width);
$sourceEdit.outerHeight(height);
- if (cm.getOption("fullScreen"))
- cm.setOption("fullScreen", false);
- cm.setSize($sourceEdit.width(), $sourceEdit.height());
+ if ($warning.is(":visible"))
+ cm.setSize($sourceEdit.width(), $sourceEdit.height()-$warning.outerHeight());
+ else
+ cm.setSize($sourceEdit.width(), $sourceEdit.height());
});
+ $warning.on("closed.bs.alert", function () {
+ $(window).resize();
+ })
},
- onWindowLoad: function(containerId, mark) {
+ onWindowLoad: function(containerId, mark, autosaveKey) {
+ var $container = $("#" + containerId);
+ var $warning = $container.find(">.source-edit>.warning");
var cm = gitplex.server.sourceEdit.getCodeMirror(containerId);
+ gitplex.server.form.registerAutosaveKey($container.closest("form.leave-confirm"), autosaveKey);
+ var autosaveValue = localStorage.getItem(autosaveKey);
+ if (autosaveValue) {
+ cm.doc.setValue(autosaveValue);
+ $warning.show();
+ }
+
if (mark && gitplex.server.viewState.getFromHistory() === undefined
&& gitplex.server.viewState.carryOver === undefined) {
gitplex.server.codemirror.scrollTo(cm, mark);
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/advanced/AdvancedSearchPanel.html b/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/advanced/AdvancedSearchPanel.html
index a3c229977b..862d1b03cb 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/advanced/AdvancedSearchPanel.html
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/advanced/AdvancedSearchPanel.html
@@ -17,7 +17,7 @@
<wicket:fragment wicket:id="symbolSearchFrag">
<div wicket:id="term" class="form-group">
<label>Search For</label>
- <input wicket:id="term" name="searchFor" class="form-control focusable" type="text"></input>
+ <input wicket:id="term" name="searchFor" class="form-control autofocus" type="text"></input>
<p class="help-block">(* = any string, ? = any character)</p>
<div wicket:id="feedback"></div>
</div>
@@ -37,7 +37,7 @@
<wicket:fragment wicket:id="fileSearchFrag">
<div wicket:id="term" class="form-group">
<label>Search For</label>
- <input wicket:id="term" name="searchFor" class="form-control focusable" type="text"></input>
+ <input wicket:id="term" name="searchFor" class="form-control autofocus" type="text"></input>
<p class="help-block">(* = any string, ? = any character)</p>
<div wicket:id="feedback"></div>
</div>
@@ -53,7 +53,7 @@
<wicket:fragment wicket:id="textSearchFrag">
<div wicket:id="term" class="form-group">
<label>Search For</label>
- <input wicket:id="term" name="searchFor" class="form-control focusable" type="text"></input>
+ <input wicket:id="term" name="searchFor" class="form-control autofocus" type="text"></input>
<div wicket:id="feedback"></div>
</div>
<div class="form-group">
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/branches/DepotBranchesPage.html b/web/src/main/java/com/gitplex/server/web/page/depot/branches/DepotBranchesPage.html
index 2b8f8316ff..29f3422190 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/branches/DepotBranchesPage.html
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/branches/DepotBranchesPage.html
@@ -81,7 +81,7 @@
<div wicket:id="feedback"></div>
<div class="form-group">
<label>Branch Name</label>
- <input wicket:id="name" class="form-control focusable">
+ <input wicket:id="name" class="form-control autofocus">
</div>
<div class="form-group">
<label>Create From</label>
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/newrequest/NewRequestPage.html b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/newrequest/NewRequestPage.html
index 728a1d2eb8..2a8f706c4f 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/newrequest/NewRequestPage.html
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/newrequest/NewRequestPage.html
@@ -73,7 +73,7 @@
<tr class="title">
<td class="name">Title <span class="required"></span></td>
<td wicket:id="title" class="value">
- <input wicket:id="title" type="text" class="form-control focusable" placeholder="Input title here">
+ <input wicket:id="title" type="text" class="form-control autofocus" placeholder="Input title here">
<div wicket:id="feedback"></div>
</td>
</tr>
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/newrequest/NewRequestPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/newrequest/NewRequestPage.java
index 30df73c02c..dbf9b21853 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/newrequest/NewRequestPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/newrequest/NewRequestPage.java
@@ -67,6 +67,7 @@ import com.gitplex.server.web.component.pullrequest.requestreviewer.ReviewerChoi
import com.gitplex.server.web.component.tabbable.AjaxActionTab;
import com.gitplex.server.web.component.tabbable.Tab;
import com.gitplex.server.web.component.tabbable.Tabbable;
+import com.gitplex.server.web.page.base.BasePage;
import com.gitplex.server.web.page.depot.DepotPage;
import com.gitplex.server.web.page.depot.NoBranchesPage;
import com.gitplex.server.web.page.depot.commit.CommitDetailPage;
@@ -507,9 +508,11 @@ public class NewRequestPage extends DepotPage implements CommentSupport {
private Fragment newCanSendFrag() {
Fragment fragment = new Fragment("status", "canSendFrag", this);
- final Form<?> form = new Form<Void>("form");
+ Form<?> form = new Form<Void>("form");
fragment.add(form);
+ String autosaveKey = "autosave:newPullRequest:" + getDepot().getId();
+
form.add(new Button("send") {
@Override
@@ -533,8 +536,11 @@ public class NewRequestPage extends DepotPage implements CommentSupport {
GitPlex.getInstance(PullRequestManager.class).open(getPullRequest());
- setResponsePage(RequestOverviewPage.class, RequestOverviewPage.paramsOf(getPullRequest()));
- }
+ PageParameters params = RequestOverviewPage.paramsOf(getPullRequest());
+ params.add(BasePage.PARAM_AUTOSAVE_KEY_TO_CLEAR, autosaveKey);
+ setResponsePage(RequestOverviewPage.class, params);
+ }
+
}
});
@@ -608,6 +614,11 @@ public class NewRequestPage extends DepotPage implements CommentSupport {
return NewRequestPage.this.getDepot();
}
+ @Override
+ protected String getAutosaveKey() {
+ return autosaveKey;
+ }
+
});
WebMarkupContainer assigneeContainer = new WebMarkupContainer("assignee");
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/newrequest/new-request.css b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/newrequest/new-request.css
index 4eab2233c4..828c905922 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/newrequest/new-request.css
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/newrequest/new-request.css
@@ -70,7 +70,7 @@
#new-request>.body>.status>.can-send form>table .reviewers li a:hover {
text-decoration: none;
}
-#new-request>.body>.status>.can-send form .alert {
+#new-request>.body>.status>.can-send form .alert-danger {
margin-bottom: 0;
margin-top: 16px;
}
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/RequestDetailPage.html b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/RequestDetailPage.html
index 9141569827..69f6f2e8a3 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/RequestDetailPage.html
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/RequestDetailPage.html
@@ -5,7 +5,7 @@
<div wicket:id="number" class="number 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">
- <input wicket:id="title" type="text" placeholder="Input title" class="form-control focusable"></input>
+ <input wicket:id="title" type="text" placeholder="Input title" class="form-control autofocus"></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"/>
</form>
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/RequestDetailPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/RequestDetailPage.java
index 5b91a74c61..fa81f5db90 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/RequestDetailPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/RequestDetailPage.java
@@ -27,6 +27,7 @@ import org.apache.wicket.MarkupContainer;
import org.apache.wicket.Page;
import org.apache.wicket.RestartResponseException;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
import org.apache.wicket.behavior.AttributeAppender;
@@ -77,6 +78,7 @@ import com.gitplex.server.web.component.tabbable.PageTab;
import com.gitplex.server.web.component.tabbable.PageTabLink;
import com.gitplex.server.web.component.tabbable.Tab;
import com.gitplex.server.web.component.tabbable.Tabbable;
+import com.gitplex.server.web.page.base.BasePage;
import com.gitplex.server.web.page.depot.DepotPage;
import com.gitplex.server.web.page.depot.NoBranchesPage;
import com.gitplex.server.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;
@@ -85,6 +87,7 @@ import com.gitplex.server.web.page.depot.pullrequest.requestdetail.integrationpr
import com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.RequestOverviewPage;
import com.gitplex.server.web.util.DateUtils;
import com.gitplex.server.web.util.WicketUtils;
+import com.gitplex.server.web.util.ajaxlistener.ConfirmLeaveListener;
import com.gitplex.server.web.util.model.EntityModel;
import com.gitplex.server.web.websocket.PullRequestChanged;
import com.gitplex.server.web.websocket.PullRequestChangedRegion;
@@ -654,6 +657,7 @@ public abstract class RequestDetailPage extends DepotPage {
DepotAndBranch source = request.getSource();
Preconditions.checkNotNull(source);
+ String autosaveKey = "autosave:pullRequestOperation:" + getPullRequest().getId();
FormComponent<String> noteInput;
form.add(noteInput = new CommentInput("note", Model.of(""), false) {
@@ -668,6 +672,11 @@ public abstract class RequestDetailPage extends DepotPage {
return requestModel.getObject().getTargetDepot();
}
+ @Override
+ protected String getAutosaveKey() {
+ return autosaveKey;
+ }
+
@Override
protected List<AttributeModifier> getInputModifiers() {
return Lists.newArrayList(AttributeModifier.replace("placeholder", "Leave a note"));
@@ -689,7 +698,9 @@ public abstract class RequestDetailPage extends DepotPage {
target.appendJavaScript("$(window).resize();");
} else {
operation.operate(request, noteInput.getModelObject());
- setResponsePage(RequestOverviewPage.class, RequestOverviewPage.paramsOf(getPullRequest()));
+ PageParameters params = RequestOverviewPage.paramsOf(getPullRequest());
+ params.add(BasePage.PARAM_AUTOSAVE_KEY_TO_CLEAR, autosaveKey);
+ setResponsePage(RequestOverviewPage.class, params);
}
}
@@ -715,6 +726,12 @@ public abstract class RequestDetailPage extends DepotPage {
})));
form.add(new AjaxLink<Void>("cancel") {
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener());
+ }
+
@Override
public void onClick(AjaxRequestTarget target) {
fragment.replaceWith(new WebMarkupContainer(id).setVisible(false));
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/RequestOverviewPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/RequestOverviewPage.java
index cdec80f636..7e214e1d91 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/RequestOverviewPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/RequestOverviewPage.java
@@ -35,14 +35,13 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.joda.time.DateTime;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
import com.gitplex.server.GitPlex;
import com.gitplex.server.manager.PullRequestCommentManager;
import com.gitplex.server.manager.PullRequestManager;
import com.gitplex.server.model.Account;
import com.gitplex.server.model.Depot;
import com.gitplex.server.model.PullRequest;
+import com.gitplex.server.model.PullRequest.IntegrationStrategy;
import com.gitplex.server.model.PullRequestComment;
import com.gitplex.server.model.PullRequestReference;
import com.gitplex.server.model.PullRequestReview;
@@ -50,7 +49,6 @@ import com.gitplex.server.model.PullRequestReviewInvitation;
import com.gitplex.server.model.PullRequestStatusChange;
import com.gitplex.server.model.PullRequestUpdate;
import com.gitplex.server.model.PullRequestWatch;
-import com.gitplex.server.model.PullRequest.IntegrationStrategy;
import com.gitplex.server.persistence.dao.Dao;
import com.gitplex.server.security.ObjectPermission;
import com.gitplex.server.security.SecurityUtils;
@@ -76,6 +74,8 @@ import com.gitplex.server.web.util.ConfirmOnClick;
import com.gitplex.server.web.util.model.EntityModel;
import com.gitplex.server.web.util.model.ReviewersModel;
import com.gitplex.server.web.websocket.PullRequestChanged;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.Lists;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
import de.agilecoders.wicket.core.markup.html.bootstrap.components.TooltipConfig;
@@ -321,6 +321,8 @@ public class RequestOverviewPage extends RequestDetailPage {
Form<?> form = new Form<Void>("form");
addComment.add(form);
+ String autosaveKey = "autosave:addPullRequestComment:" + getPullRequest().getId();
+
CommentInput input = new CommentInput("input", Model.of(""), false) {
@Override
@@ -333,6 +335,11 @@ public class RequestOverviewPage extends RequestDetailPage {
return RequestOverviewPage.this.getDepot();
}
+ @Override
+ protected String getAutosaveKey() {
+ return autosaveKey;
+ }
+
@Override
protected List<AttributeModifier> getInputModifiers() {
return Lists.newArrayList(AttributeModifier.replace("placeholder", "Leave a comment"));
@@ -368,6 +375,7 @@ public class RequestOverviewPage extends RequestDetailPage {
newActivityRow.getMarkupId(), lastActivityRow.getMarkupId());
target.prependJavaScript(script);
target.add(newActivityRow);
+ target.appendJavaScript(String.format("localStorage.removeItem('%s');", autosaveKey));
}
@Override
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/CommentedPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/CommentedPanel.java
index 9076cc9df1..ce44ac772c 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/CommentedPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/CommentedPanel.java
@@ -113,6 +113,7 @@ class CommentedPanel extends GenericPanel<PullRequestComment> {
NotificationPanel feedback = new NotificationPanel("feedback", form);
feedback.setOutputMarkupPlaceholderTag(true);
form.add(feedback);
+ String autosaveKey = "autosave:editPullRequestComment:" + getComment().getId();
CommentInput input = new CommentInput("input", Model.of(getComment().getContent()), false) {
@Override
@@ -120,6 +121,11 @@ class CommentedPanel extends GenericPanel<PullRequestComment> {
return new DepotAttachmentSupport(getDepot(), getComment().getRequest().getUUID());
}
+ @Override
+ protected String getAutosaveKey() {
+ return autosaveKey;
+ }
+
@Override
protected Depot getDepot() {
return getComment().getDepot();
@@ -144,6 +150,7 @@ class CommentedPanel extends GenericPanel<PullRequestComment> {
Component viewer = newViewer();
editor.replaceWith(viewer);
target.add(viewer);
+ target.appendJavaScript(String.format("localStorage.removeItem('%s');", autosaveKey));
} catch (StaleStateException e) {
error("Some one changed the content you are editing. Reload the page and try again.");
target.add(feedback);
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/OpenedPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/OpenedPanel.java
index 664a78505e..8dae38f61e 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/OpenedPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/OpenedPanel.java
@@ -95,13 +95,18 @@ class OpenedPanel extends GenericPanel<PullRequest> {
feedback.setOutputMarkupPlaceholderTag(true);
form.add(feedback);
+ String autosaveKey = "autosave:editPullRequestDescription:" + getPullRequest().getId();
long lastVersion = getPullRequest().getVersion();
CommentInput input = new CommentInput("input", Model.of(getPullRequest().getDescription()), false) {
@Override
protected AttachmentSupport getAttachmentSupport() {
- return new DepotAttachmentSupport(getPullRequest().getTargetDepot(),
- getPullRequest().getUUID());
+ return new DepotAttachmentSupport(getPullRequest().getTargetDepot(), getPullRequest().getUUID());
+ }
+
+ @Override
+ protected String getAutosaveKey() {
+ return autosaveKey;
}
@Override
@@ -131,6 +136,7 @@ class OpenedPanel extends GenericPanel<PullRequest> {
Component viewer = newViewer();
editor.replaceWith(viewer);
target.add(viewer);
+ target.appendJavaScript(String.format("localStorage.removeItem('%s');", autosaveKey));
} catch (StaleStateException e) {
error("Some one changed the content you are editing. Reload the page and try again.");
target.add(feedback);
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/StatusChangePanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/StatusChangePanel.java
index 0bede51ac9..94987be44d 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/StatusChangePanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/StatusChangePanel.java
@@ -99,6 +99,7 @@ class StatusChangePanel extends GenericPanel<PullRequestStatusChange> {
feedback.setOutputMarkupPlaceholderTag(true);
form.add(feedback);
+ String autosaveKey = "autosave:editPullRequestStatusChange:" + getStatusChange().getId();
long lastVersion = getStatusChange().getVersion();
CommentInput input = new CommentInput("input", Model.of(getStatusChange().getNote()), false) {
@@ -113,6 +114,11 @@ class StatusChangePanel extends GenericPanel<PullRequestStatusChange> {
return getStatusChange().getRequest().getTargetDepot();
}
+ @Override
+ protected String getAutosaveKey() {
+ return autosaveKey;
+ }
+
};
form.add(input);
@@ -135,6 +141,7 @@ class StatusChangePanel extends GenericPanel<PullRequestStatusChange> {
Component viewer = newViewer();
editor.replaceWith(viewer);
target.add(viewer);
+ target.appendJavaScript(String.format("localStorage.removeItem('%s');", autosaveKey));
} catch (StaleStateException e) {
error("Some one changed the content you are editing. Reload the page and try again.");
target.add(feedback);
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/request-detail.css b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/request-detail.css
index ca277ee7fc..33b35630e9 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/request-detail.css
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/request-detail.css
@@ -101,8 +101,7 @@
#request-detail>.summary>.operations>.confirm>form>input {
margin-right: 12px;
}
-#request-detail>.summary>.operations>.confirm>form>textarea,
-#request-detail>.summary>.operations>.confirm>form>.delete-source {
+#request-detail>.summary>.operations>.confirm>form .markdown-editor {
margin-bottom: 16px;
}
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestlist/RequestListPage.html b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestlist/RequestListPage.html
index 857f88c848..4e17c96eb3 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestlist/RequestListPage.html
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestlist/RequestListPage.html
@@ -11,7 +11,7 @@
<div class="head">Filter options</div>
<div class="body">
<form wicket:id="filterForm">
- <div wicket:id="editor" class="nofocus"></div>
+ <div wicket:id="editor" class="no-autofocus"></div>
<button type="submit" class="btn btn-primary"><i class="fa fa-search"></i> Search</button>
</form>
</div>
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/tags/DepotTagsPage.html b/web/src/main/java/com/gitplex/server/web/page/depot/tags/DepotTagsPage.html
index 2a290a05c7..6f31cf652e 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/tags/DepotTagsPage.html
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/tags/DepotTagsPage.html
@@ -59,7 +59,7 @@
<div wicket:id="feedback"></div>
<div class="form-group">
<label>Tag Name</label>
- <input wicket:id="name" class="form-control focusable">
+ <input wicket:id="name" class="form-control autofocus">
</div>
<div class="form-group">
<label>Tag Message</label>
diff --git a/web/src/main/java/com/gitplex/server/web/page/home/DashboardPage.html b/web/src/main/java/com/gitplex/server/web/page/home/DashboardPage.html
index ef8e0be684..fb91d8e2f5 100644
--- a/web/src/main/java/com/gitplex/server/web/page/home/DashboardPage.html
+++ b/web/src/main/java/com/gitplex/server/web/page/home/DashboardPage.html
@@ -1,7 +1,7 @@
<wicket:extend>
<div id="dashboard">
<div class="search">
- <input wicket:id="search" class="form-control focusable" placeholder="Search..."></input>
+ <input wicket:id="search" class="form-control autofocus" placeholder="Search..."></input>
</div>
<ul wicket:id="depots" class="list-unstyled">
<li wicket:id="depots">
diff --git a/web/src/main/java/com/gitplex/server/web/page/security/LoginPage.html b/web/src/main/java/com/gitplex/server/web/page/security/LoginPage.html
index 64b969ece3..a75db1582a 100644
--- a/web/src/main/java/com/gitplex/server/web/page/security/LoginPage.html
+++ b/web/src/main/java/com/gitplex/server/web/page/security/LoginPage.html
@@ -5,7 +5,7 @@
<form wicket:id="form" method="post">
<div class="input-group username">
<span class="input-group-addon"><i class="fa fa-user fa-fw"></i></span>
- <input wicket:id="userName" autocomplete="username" type="text" class="form-control input-lg focusable" placeholder="User name" />
+ <input wicket:id="userName" autocomplete="username" type="text" class="form-control input-lg autofocus" placeholder="User name" />
</div>
<div class="input-group password">
<span class="input-group-addon"><i class="fa fa-key fa-fw"></i></span>
diff --git a/web/src/main/java/com/gitplex/server/web/page/test/TestPage.html b/web/src/main/java/com/gitplex/server/web/page/test/TestPage.html
index d07ad735c9..3de01c2e58 100644
--- a/web/src/main/java/com/gitplex/server/web/page/test/TestPage.html
+++ b/web/src/main/java/com/gitplex/server/web/page/test/TestPage.html
@@ -1,3 +1,3 @@
<wicket:extend>
- <div wicket:id="markdownEditor" style="padding: 50px;"></div>
+ <div wicket:id="markdownEditor"></div>
</wicket:extend>
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/page/test/TestPage.java b/web/src/main/java/com/gitplex/server/web/page/test/TestPage.java
index 8665d0c938..8e1162521f 100644
--- a/web/src/main/java/com/gitplex/server/web/page/test/TestPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/test/TestPage.java
@@ -13,7 +13,14 @@ public class TestPage extends BasePage {
protected void onInitialize() {
super.onInitialize();
- add(new MarkdownEditor("markdownEditor", Model.of(""), false, true));
+ add(new MarkdownEditor("markdownEditor", Model.of(""), false, true) {
+
+ @Override
+ protected String getAutosaveKey() {
+ return "test";
+ }
+
+ });
}
@Override