Skip to content

The Unified and Autonomous Development Platform

Able to edit markdown in full screen mode

robin shenb10207ca9edd
diff --git a/web/src/main/java/com/gitplex/server/web/component/comment/CommentInput.java b/web/src/main/java/com/gitplex/server/web/component/comment/CommentInput.java
index cdab8a5b27..04e3021722 100644
--- a/web/src/main/java/com/gitplex/server/web/component/comment/CommentInput.java
+++ b/web/src/main/java/com/gitplex/server/web/component/comment/CommentInput.java
@@ -26,7 +26,7 @@ import com.gitplex.server.web.component.markdown.UserMentionSupport;
public abstract class CommentInput extends MarkdownEditor {
public CommentInput(String id, IModel<String> model, boolean compactMode) {
- super(id, model, compactMode, true);
+ super(id, model, compactMode);
}
@Override
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 6f74d895d2..0dfe00f61d 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
@@ -5,7 +5,7 @@
<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="pull-left normal-mode">
<div class="btn-group">
<a class="do-bold btn btn-default btn-sm" title="Bold"><i class="fa fa-bold"></i></a>
<a class="do-italic btn btn-default btn-sm" title="Italic"><i class="fa fa-italic"></i></a>
@@ -28,7 +28,7 @@
<a class="do-hashtag btn btn-default btn-sm" title="Reference Pull Request"><i class="fa fa-hashtag"></i></a>
</div>
</div>
- <div wicket:id="compactMode" class="pull-left dropdown">
+ <div class="pull-left dropdown compact-mode">
<button class="btn btn-default btn-sm" data-toggle="dropdown" type="button"><i class="fa fa-navicon"></i></button>
<ul class="dropdown-menu" aria-labelledby="dLabel">
<li><a class="do-bold"><i class="fa fa-bold fa-fw"></i> Bold</a></li>
@@ -50,6 +50,9 @@
</ul>
</div>
<div class="pull-right">
+ <div class="btn-group">
+ <a class="do-fullscreen btn btn-default btn-sm" title="Full screen"><i class="fa fa-expand"></i></a>
+ </div>
<div class="btn-group">
<a class="do-help btn btn-default btn-sm" title="Help"><i class="fa fa-question"></i></a>
</div>
@@ -67,7 +70,7 @@
</div>
<div class="body clearfix">
<div wicket:id="edit" class="edit">
- <textarea wicket:id="input" rows=5 class="autofocus"></textarea>
+ <textarea wicket:id="input" class="autofocus"></textarea>
<div class="ui-resizable-handle ui-resizable-s"></div>
</div>
<div wicket:id="preview" 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 1a53caeb4f..d91386b0cc 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
@@ -60,8 +60,6 @@ public class MarkdownEditor extends FormComponentPanel<String> {
private final boolean compactMode;
- private final boolean resizable;
-
private final boolean initialSplit;
private WebMarkupContainer container;
@@ -79,10 +77,9 @@ public class MarkdownEditor extends FormComponentPanel<String> {
* editor in compact mode occupies horizontal space and is suitable
* to be used in places such as comment aside the code
*/
- public MarkdownEditor(String id, IModel<String> model, boolean compactMode, boolean resizable) {
+ public MarkdownEditor(String id, IModel<String> model, boolean compactMode) {
super(id, model);
this.compactMode = compactMode;
- this.resizable = resizable;
String cookieKey;
if (compactMode)
@@ -119,9 +116,6 @@ public class MarkdownEditor extends FormComponentPanel<String> {
add(container);
- container.add(new WebMarkupContainer("normalMode").setVisible(!compactMode));
- container.add(new WebMarkupContainer("compactMode").setVisible(compactMode));
-
WebMarkupContainer editLink = new WebMarkupContainer("editLink");
WebMarkupContainer splitLink = new WebMarkupContainer("splitLink");
WebMarkupContainer preview = new WebMarkupContainer("preview");
@@ -133,8 +127,6 @@ public class MarkdownEditor extends FormComponentPanel<String> {
WebMarkupContainer splitIcon = new WebMarkupContainer("icon");
splitLink.add(splitIcon);
- if (compactMode)
- splitIcon.add(AttributeAppender.append("class", "fa-rotate-270"));
container.add(AttributeAppender.append("class", compactMode?"compact-mode":"normal-mode"));
@@ -145,17 +137,23 @@ public class MarkdownEditor extends FormComponentPanel<String> {
if (initialSplit) {
container.add(AttributeAppender.append("class", "split-mode"));
- preview.add(new Label("rendered", render(getModelObject())).setEscapeModelStrings(false));
+ preview.add(new Label("rendered", render(getModelObject())) {
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ String script = String.format(
+ "gitplex.server.markdown.initRendered($('#%s>.body>.preview>.markdown-rendered'));",
+ container.getMarkupId());
+ response.render(OnDomReadyHeaderItem.forScript(script));
+ }
+
+ }.setEscapeModelStrings(false));
splitLink.add(AttributeAppender.append("class", "active"));
- if (!compactMode) {
- edit.add(AttributeAppender.append("style", "width: 50%;"));
- preview.add(AttributeAppender.append("style", "width: 50%;"));
- }
} else {
container.add(AttributeAppender.append("class", "edit-mode"));
preview.add(new WebMarkupContainer("rendered"));
editLink.add(AttributeAppender.append("class", "active"));
- preview.add(AttributeAppender.append("style", "display: none;"));
}
container.add(new WebMarkupContainer("canAttachFile").setVisible(getAttachmentSupport()!=null));
@@ -347,7 +345,7 @@ public class MarkdownEditor extends FormComponentPanel<String> {
else
autosaveKey = "undefined";
- String script = String.format("gitplex.server.markdown.onDomReady('%s', %s, %d, %s, %d, %b, %b, %b, %s);",
+ String script = String.format("gitplex.server.markdown.onDomReady('%s', %s, %d, %s, %d, %b, %b, %s);",
container.getMarkupId(),
callback,
ATWHO_LIMIT,
@@ -355,7 +353,6 @@ public class MarkdownEditor extends FormComponentPanel<String> {
getAttachmentSupport()!=null?getAttachmentSupport().getAttachmentMaxSize():0,
getUserMentionSupport() != null,
getPullRequestReferenceSupport() != null,
- resizable,
autosaveKey);
response.render(OnDomReadyHeaderItem.forScript(script));
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 e8783a6cf6..820d0e0470 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,11 +1,27 @@
-.markdown-editor>.warning {
- margin-bottom: 4px;
+.markdown-editor.compact-mode .normal-mode, .markdown-editor.normal-mode .compact-mode {
display: none;
+}
+.markdown-editor.fullscreen {
+ position: absolute;
+ left: 0;
+ top: 0;
+ width: 100%;
+ z-index: 1000;
+ padding: 20px;
+ background: white;
+}
+.markdown-editor.compact-mode>.head .split .fa {
+ transform: rotate(270deg);
+}
+
+.markdown-editor>.warning {
+ margin-bottom: 8px;
padding-top: 8px;
padding-bottom: 8px;
+ display: none;
}
.markdown-editor>.head {
- padding: 8px 0;
+ padding-bottom: 8px;
}
.markdown-editor>.head .pull-left .btn-group {
margin-right: 4px;
@@ -62,10 +78,47 @@
border-radius: 4px;
background: white;
}
-.markdown-editor>.body>.edit {
+
+.markdown-editor.normal-mode.edit-mode>.body>.edit {
+ width: 100%;
+}
+.markdown-editor.normal-mode.edit-mode>.body>.preview {
+ display: none;
+}
+.markdown-editor.normal-mode.preview-mode>.body>.edit {
+ display: none;
+}
+.markdown-editor.normal-mode.preview-mode>.body>.preview {
+ width: 100%;
+}
+.markdown-editor.normal-mode.split-mode>.body>.edit {
float: left;
+ width: 50%;
+}
+.markdown-editor.normal-mode.split-mode>.body>.preview {
+ float: left;
+ width: 50%;
+}
+
+.markdown-editor.compact-mode.edit-mode>.body>.edit {
+ width: 100%;
+}
+.markdown-editor.compact-mode.edit-mode>.body>.preview {
+ display: none;
+}
+.markdown-editor.compact-mode.preview-mode>.body>.edit {
+ display: none;
+}
+.markdown-editor.compact-mode.preview-mode>.body>.preview {
width: 100%;
}
+.markdown-editor.compact-mode.split-mode>.body>.edit {
+ width: 100%;
+}
+.markdown-editor.compact-mode.split-mode>.body>.preview {
+ width: 100%;
+}
+
.markdown-editor>.body>.edit>textarea {
border: 1px solid #BBB;
border-radius: 4px;
@@ -74,19 +127,12 @@
display: block;
resize: none;
}
-.markdown-editor>.body>.preview {
- float: left;
- width: 49%;
-}
.markdown-editor>.body>.preview>.markdown-rendered {
overflow: auto;
}
.markdown-editor>.body>.preview>.markdown-rendered>.message {
color: #999;
}
-.markdown-editor.compact-mode>.body>* {
- width: 100%;
-}
.markdown-editor.normal-mode.split-mode>.body>.edit>textarea {
border-radius: 4px 0 0 4px;
}
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 237cc9f7fa..5041252705 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
@@ -14,8 +14,40 @@ gitplex.server.markdown = {
$input[0].dispatchEvent(evt);
}
},
- onDomReady: function(containerId, callback, atWhoLimit, attachmentSupport, attachmentMaxSize,
- canMentionUser, canReferencePullRequest, resizable, autosaveKey) {
+ autofit: function(containerId, width, height) {
+ var $container = $("#" + containerId);
+ var $head = $container.children(".head");
+ var $body = $container.children(".body");
+ 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.outerWidth(width).outerHeight(height);
+
+ width = $container.width();
+ height = $container.height();
+
+ height -= $head.outerHeight();
+ if ($warning.is(":visible"))
+ height -= $warning.outerHeight(true);
+ if ($emojis.is(":visible"))
+ height -= $emojis.outerHeight(true);
+ if ($help.is(":visible"))
+ height -= $help.outerHeight(true);
+ if ($container.hasClass("compact-mode")) {
+ height = height/2;
+ }
+ $input.outerHeight(height);
+ $edit.outerHeight($input.outerHeight());
+ $rendered.outerHeight($input.outerHeight());
+ $preview.outerHeight($rendered.outerHeight());
+ },
+ onDomReady: function(containerId, callback, atWhoLimit, attachmentSupport,
+ attachmentMaxSize, canMentionUser, canReferencePullRequest, autosaveKey) {
var $container = $("#" + containerId);
var $head = $container.children(".head");
var $body = $container.children(".body");
@@ -29,26 +61,25 @@ gitplex.server.markdown = {
var $input = $edit.children("textarea");
var $preview = $body.children(".preview");
var $rendered = $preview.children(".markdown-rendered");
+ var $resizeHandles = $container.find(".ui-resizable-handle");
$container.data("autosaveKey", autosaveKey);
$head.find(".dropdown>button").dropdown();
$editLink.click(function() {
+ $container.removeClass("preview-mode").removeClass("split-mode").addClass("edit-mode");
$head.find(".pull-left .btn").removeAttr("disabled");
-
- $preview.hide();
- $edit.show();
$input.focus();
$editLink.addClass("active");
$previewLink.removeClass("active");
$splitLink.removeClass("active");
- $container.removeClass("preview-mode").removeClass("split-mode").addClass("edit-mode");
onLayoutChange();
Cookies.set(gitplex.server.markdown.getCookiePrefix($container)+".split", false, {expires: Infinity});
});
$previewLink.click(function() {
- $head.find(".pull-left .btn").prop("disabled", "disabled");
+ $container.removeClass("edit-mode").removeClass("split-mode").addClass("preview-mode");
+ $head.find(".pull-left .btn").attr("disabled", "disabled");
var caret = $input.caret();
if ($input.val().substring(0, caret).trim().length == 0) {
@@ -65,46 +96,31 @@ gitplex.server.markdown = {
$rendered.data("caretOffset", caretOffset);
$rendered.html("<div class='message'>Loading...</div>");
- $preview.show();
- $edit.hide();
$editLink.removeClass("active");
$previewLink.addClass("active");
$splitLink.removeClass("active");
- $container.removeClass("edit-mode").removeClass("split-mode").addClass("preview-mode");
onLayoutChange();
callback("render", $input.val());
});
$splitLink.click(function() {
+ $container.removeClass("edit-mode").removeClass("preview-mode").addClass("split-mode");
$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});
});
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());
- }
+ if ($container.hasClass("normal-mode") && $container.hasClass("split-mode")) {
+ $rendered.outerHeight($input.outerHeight());
+ $preview.outerHeight($edit.outerHeight());
}
}
@@ -133,9 +149,39 @@ gitplex.server.markdown = {
}, 500);
var fontSize = parseInt(getComputedStyle($input[0]).getPropertyValue('font-size'));
+
/*
- * Padding same leading spaces as last line when add a new line. This is useful when
- * add several list items
+ * We intercept the "Enter" key event to do below things to make editing more conveniently:
+ *
+ * 1. When there is a list item in current line, then add an empty list item automatically
+ * to next line. For instance, if current input is:
+ *
+ * - item
+ *
+ * The new input will be as below upon "Enter":
+ *
+ * - item
+ * -
+ *
+ * 2. When there is an empty item in current line, then remove that empty item upon "Enter":
+ *
+ * - item
+ * (blank line)
+ * (blank line)
+ *
+ * 3. When current line has leading spaces, make new line has same leading spaces as well.
+ * For instance if current line is:
+ *
+ * void main() {
+ * for (int i=0; i<100; i++) {
+ *
+ * The new input will be as below upon "Enter":
+ *
+ * void main() {
+ * for (int i=0; i<100; i++) {
+ * (line starts here)
+ *
+ *
*/
$input.on("keydown", function(e) {
if (e.keyCode == 13) {
@@ -167,7 +213,8 @@ gitplex.server.markdown = {
$input.val(newInputBeforeCaret + inputAfterCaret);
$input.caret(newInputBeforeCaret.length);
}
-
+
+ // match against task items
var match = /^[-*]\s+\[[x ]\] /.exec(nonSpaceInCurrentLine);
if (match != null) {
if (nonSpaceInCurrentLine.length > match[0].length) {
@@ -192,6 +239,7 @@ gitplex.server.markdown = {
clearLastLine();
}
} else {
+ // match against ordered list items
match = /^\d+\. /.exec(nonSpaceInCurrentLine);
if (match != null) {
if (nonSpaceInCurrentLine.length > match[0].length) {
@@ -207,6 +255,7 @@ gitplex.server.markdown = {
}
}
+ // Scroll if necessary to make cursor visible
var caretBottom = getCaretCoordinates($input[0], $input.caret()).top + fontSize;
if (caretBottom > $input.scrollTop() + $input.height()) {
$input.scrollTop(caretBottom - $input.height());
@@ -216,69 +265,56 @@ gitplex.server.markdown = {
}
});
- if (resizable) {
- $edit.resizable({
- autoHide: false,
- handles: {"s": $edit.children(".ui-resizable-handle")},
- minHeight: 75,
- resize: function(e, ui) {
- $input.outerHeight($edit.height());
- if ($container.hasClass("normal-mode") && $container.hasClass("split-mode")) {
- $rendered.outerHeight($input.outerHeight());
- $preview.outerHeight($edit.outerHeight());
- }
- },
- stop: function(e, ui) {
- Cookies.set(gitplex.server.markdown.getCookiePrefix($container)+".inputHeight",
- $input.outerHeight(), {expires: Infinity});
- if ($container.hasClass("normal-mode") && $container.hasClass("split-mode")) {
- Cookies.set(gitplex.server.markdown.getCookiePrefix($container)+".renderedHeight",
- $rendered.outerHeight(), {expires: Infinity});
- }
+ $edit.resizable({
+ autoHide: false,
+ handles: {"s": $edit.children(".ui-resizable-handle")},
+ minHeight: 75,
+ resize: function(e, ui) {
+ $input.outerHeight($edit.height());
+ if ($container.hasClass("normal-mode") && $container.hasClass("split-mode")) {
+ $rendered.outerHeight($input.outerHeight());
+ $preview.outerHeight($edit.outerHeight());
}
- });
-
- $preview.resizable({
- handles: {"s": $preview.children(".ui-resizable-handle")},
- minHeight: 75,
- resize: function(e, ui) {
- $rendered.outerHeight($preview.height());
- if ($container.hasClass("normal-mode") && $container.hasClass("split-mode")) {
- $input.outerHeight($rendered.outerHeight());
- $edit.outerHeight($preview.outerHeight());
- }
- },
- stop: function(e, ui) {
+ },
+ stop: function(e, ui) {
+ Cookies.set(gitplex.server.markdown.getCookiePrefix($container)+".inputHeight",
+ $input.outerHeight(), {expires: Infinity});
+ if ($container.hasClass("normal-mode") && $container.hasClass("split-mode")) {
Cookies.set(gitplex.server.markdown.getCookiePrefix($container)+".renderedHeight",
$rendered.outerHeight(), {expires: Infinity});
- if ($container.hasClass("normal-mode") && $container.hasClass("split-mode")) {
- Cookies.set(gitplex.server.markdown.getCookiePrefix($container)+".inputHeight",
- $input.outerHeight(), {expires: Infinity});
- }
}
- });
- } 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"))
- height -= $help.outerHeight();
- if ($container.hasClass("compact-mode")) {
- height = height/2;
+ }
+ });
+
+ $preview.resizable({
+ handles: {"s": $preview.children(".ui-resizable-handle")},
+ minHeight: 75,
+ resize: function(e, ui) {
+ $rendered.outerHeight($preview.height());
+ if ($container.hasClass("normal-mode") && $container.hasClass("split-mode")) {
+ $input.outerHeight($rendered.outerHeight());
+ $edit.outerHeight($preview.outerHeight());
}
- $input.outerHeight(height);
- $rendered.outerHeight($input.outerHeight());
- });
- }
+ },
+ stop: function(e, ui) {
+ Cookies.set(gitplex.server.markdown.getCookiePrefix($container)+".renderedHeight",
+ $rendered.outerHeight(), {expires: Infinity});
+ if ($container.hasClass("normal-mode") && $container.hasClass("split-mode")) {
+ Cookies.set(gitplex.server.markdown.getCookiePrefix($container)+".inputHeight",
+ $input.outerHeight(), {expires: Infinity});
+ }
+ }
+ });
+
+ $warning.on("closed.bs.alert", function () {
+ if (!$resizeHandles.is(":visible"))
+ gitplex.server.markdown.autofit(containerId, $container.outerWidth(), $container.outerHeight());
+ })
+
+ $container.on("autofit", function(e, width, height) {
+ $resizeHandles.hide();
+ gitplex.server.markdown.autofit(containerId, width, height);
+ });
function onSelectUrl(isImage) {
var $modal = $("" +
@@ -408,14 +444,73 @@ gitplex.server.markdown = {
callback("loadEmojis");
}
$emojis.toggle();
- $(this).toggleClass("active");
- $(window).resize();
+ $head.find(".do-emoji").toggleClass("active");
+ if (!$resizeHandles.is(":visible"))
+ gitplex.server.markdown.autofit(containerId, $container.outerWidth(), $container.outerHeight());
});
$head.find(".do-help").click(function() {
$(this).toggleClass("active");
$help.toggle();
- $(window).resize();
+ if (!$resizeHandles.is(":visible"))
+ gitplex.server.markdown.autofit(containerId, $container.outerWidth(), $container.outerHeight());
+ });
+
+ function getReplacement() {
+ var $replacement = $container.closest("form");
+ if ($replacement.length == 0)
+ $replacement = $container;
+ return $replacement;
+ }
+
+ $head.find(".do-fullscreen").click(function() {
+ var $replacement = getReplacement();
+ if ($container.hasClass("fullscreen")) {
+ $container.removeClass("fullscreen");
+ var $placeholder = $("#" + containerId + "-placeholder");
+
+ $replacement.insertBefore($placeholder);
+ $placeholder.remove();
+
+ $(this).removeClass("active");
+ if ($container.data("compactModePreviously")) {
+ $container.removeClass("normal-mode");
+ $container.addClass("compact-mode");
+ }
+ if ($container.data("resizeHandlesVisiblePreviously"))
+ $resizeHandles.show();
+
+ if ($resizeHandles.is(":visible")) {
+ $container.css("width", "inherit").css("height", "inherit");
+ gitplex.server.markdown.restoreSizeFromCookie($container);
+ } else {
+ $(window).resize();
+ }
+ } else {
+ $container.addClass("fullscreen");
+ $container.data("resizeHandlesVisiblePreviously", $resizeHandles.is(":visible"));
+ if ($container.hasClass("compact-mode")) {
+ $container.removeClass("compact-mode");
+ $container.addClass("normal-mode");
+ $container.data("compactModePreviously", true);
+ } else {
+ $container.data("compactModePreviously", false);
+ }
+ $resizeHandles.hide();
+ var $placeholder = $("<div id='" + containerId + "-placeholder'></div>");
+ $placeholder.insertAfter($replacement);
+ $("body").append($replacement);
+ $(this).addClass("active");
+ $(window).resize();
+ }
+ if ($input.is(":visible"))
+ $input.focus();
+ });
+
+ $(window).resize(function() {
+ if ($container.hasClass("fullscreen")) {
+ gitplex.server.markdown.autofit(containerId, $(window).width(), $(window).height());
+ }
});
$head.find(".do-mention, .do-hashtag").click(function() {
@@ -647,6 +742,28 @@ gitplex.server.markdown = {
}
$rendered.scrollTop(scrollTop);
+ },
+ restoreSizeFromCookie: 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");
+
+ var inputHeight = Cookies.get(gitplex.server.markdown.getCookiePrefix($container)+".inputHeight");
+ if (inputHeight) {
+ $input.outerHeight(parseInt(inputHeight));
+ } else {
+ $input.outerHeight(100);
+ }
+ $edit.outerHeight($input.outerHeight());
+ var renderedHeight = Cookies.get(gitplex.server.markdown.getCookiePrefix($container)+".renderedHeight");
+ if (renderedHeight) {
+ $rendered.outerHeight(parseInt(renderedHeight));
+ } else {
+ $rendered.outerHeight(100);
+ }
+ $preview.outerHeight($rendered.outerHeight());
},
onWindowLoad: function(containerId) {
var $container = $("#" + containerId);
@@ -655,18 +772,10 @@ gitplex.server.markdown = {
var $warning = $container.children(".warning");
var $rendered = $body.find(">.preview>.markdown-rendered");
var $input = $body.find(">.edit>textarea");
-
- if ($container.find(".ui-resizable-handle").is(":visible")) {
- var inputHeight = Cookies.get(gitplex.server.markdown.getCookiePrefix($container)+".inputHeight");
- if (inputHeight) {
- $input.outerHeight(parseInt(inputHeight));
- }
- var renderedHeight = Cookies.get(gitplex.server.markdown.getCookiePrefix($container)+".renderedHeight");
- if (renderedHeight) {
- $rendered.outerHeight(parseInt(renderedHeight));
- } else {
- $rendered.outerHeight($input.outerHeight());
- }
+ var $resizeHandles = $container.find(".ui-resizable-handle");
+
+ if ($resizeHandles.is(":visible")) {
+ gitplex.server.markdown.restoreSizeFromCookie($container);
}
var autosaveKey = $container.data("autosaveKey");
@@ -675,12 +784,21 @@ gitplex.server.markdown = {
var autosaveValue = localStorage.getItem(autosaveKey);
if (autosaveValue) {
$input.val(autosaveValue);
- $warning.show();
+ $warning.show();
+ gitplex.server.markdown.autofit(containerId, $container.outerWidth(), $container.outerHeight());
gitplex.server.markdown.fireInputEvent($input);
}
}
- if ($input.is(":focus"))
- $input.caret(0);
+
+ /*
+ * Caret may moves to end of input when auto-saved value is restored, or loaded via Firefox. For better
+ * usage experience, we force it to change to begin of input while preserving previous focus
+ */
+ var prevActive = document.activeElement;
+ $input.caret(0);
+ if (prevActive)
+ $(prevActive).focus();
+ $input.scrollTop(0);
},
onRendered: function(containerId, html) {
var $preview = $("#" + containerId + ">.body>.preview");
@@ -775,7 +893,7 @@ gitplex.server.markdown = {
$input.caret(":" + $(this).attr("title") + ": ");
gitplex.server.markdown.fireInputEvent($input);
});
- $(window).resize();
+ gitplex.server.markdown.autofit(containerId, $container.outerWidth(), $container.outerHeight());
},
insertUrl: function(containerId, isImage, url, name, replaceMessage) {
var $head = $("#" + containerId + ">.head");
diff --git a/web/src/main/java/com/gitplex/server/web/editable/string/StringPropertyEditor.java b/web/src/main/java/com/gitplex/server/web/editable/string/StringPropertyEditor.java
index 133e7f27b4..579a4fca19 100644
--- a/web/src/main/java/com/gitplex/server/web/editable/string/StringPropertyEditor.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/string/StringPropertyEditor.java
@@ -39,7 +39,7 @@ public class StringPropertyEditor extends PropertyEditor<String> {
Method getter = getPropertyDescriptor().getPropertyGetter();
if (getter.getAnnotation(Markdown.class) != null) {
Fragment fragment = new Fragment("content", "markdownFrag", this);
- fragment.add(input = new MarkdownEditor("input", Model.of(getModelObject()), false, true));
+ fragment.add(input = new MarkdownEditor("input", Model.of(getModelObject()), false));
add(fragment);
} else if (getter.getAnnotation(Multiline.class) != null) {
Fragment fragment = new Fragment("content", "multiLineFrag", this);
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 0d99922fcc..46e3297efc 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
@@ -34,7 +34,7 @@ abstract class MarkdownBlobEditor extends FormComponentPanel<byte[]> {
super.onInitialize();
add(input = new MarkdownEditor("input", Model.of(new String(getModelObject(), Charset.forName(charset))),
- false, false) {
+ false) {
@Override
protected BlobReferenceSupport getBlobReferenceSupport() {
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 3f646f136a..f9ed1747c0 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
@@ -29,5 +29,5 @@
border-left: none;
}
.blob-edit .markdown-editor>.warning {
- margin: 12px 8px 4px 8px;
+ margin: 8px 8px 0 8px;
}
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 3de01c2e58..feb93d64c6 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,5 @@
<wicket:extend>
+ <div style="padding: 100px;">
<div wicket:id="markdownEditor"></div>
+ </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 8e1162521f..792d19e65d 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,7 @@ 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) {
@Override
protected String getAutosaveKey() {