The Unified and Autonomous Development Platform
Fix the issue that markdown editor can not auto-focused in split mode
robin shen0d825a6a9cd6
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.htmlindex 4f4b262e19..86f291cf19 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,5 @@<wicket:panel>- <div wicket:id="container" class="markdown-editor edit-mode autofit no-autosize">+ <div wicket:id="container" class="markdown-editor autofit no-autosize"><div class="warning alert alert-warning"><button class="close" data-dismiss="alert"><span>×</span></button><div class="message"><i class="fa fa-warning"></i> Below content is restored from an unsaved change</div>@@ -52,9 +52,9 @@<a class="do-help btn btn-default btn-sm" title="Help"><i class="fa fa-question"></i></a></div><div class="btn-group">- <a class="edit active btn btn-default btn-sm" title="Edit"><i class="fa fa-font"></i></a>+ <a wicket:id="editLink" class="edit btn btn-default btn-sm" title="Edit"><i class="fa fa-font"></i></a><a class="preview btn btn-default btn-sm" title="Preview"><i class="fa fa-eye"></i></a>- <a class="split btn btn-default btn-sm" title="Split view"><i wicket:id="splitIcon" class="fa fa-columns"></i></a>+ <a wicket:id="splitLink" class="split btn btn-default btn-sm" title="Split view"><i wicket:id="icon" class="fa fa-columns"></i></a></div></div></div>@@ -64,12 +64,12 @@<span wicket:id="canAttachFile">You may drop file/image to the input box, or paste image from clipboard</span></div><div class="body clearfix">- <div class="edit">+ <div wicket:id="edit" class="edit"><textarea wicket:id="input" rows=5 class="autofocus"></textarea><div class="ui-resizable-handle ui-resizable-s"></div></div>- <div class="preview">- <div class="markdown-rendered"></div>+ <div wicket:id="preview" class="preview">+ <div wicket:id="rendered" class="markdown-rendered"></div><div class="ui-resizable-handle ui-resizable-s"></div></div></div>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.javaindex fd45282e8e..1a53caeb4f 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@@ -10,6 +10,7 @@ import java.util.List;import java.util.Map;import javax.annotation.Nullable;+import javax.servlet.http.Cookie;import org.apache.commons.lang3.SerializationUtils;import org.apache.commons.lang3.StringEscapeUtils;@@ -26,12 +27,14 @@ import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.markup.head.OnDomReadyHeaderItem;import org.apache.wicket.markup.head.OnLoadHeaderItem;import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.FormComponentPanel;import org.apache.wicket.markup.html.form.TextArea;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.IRequestParameters;import org.apache.wicket.request.cycle.RequestCycle;+import org.apache.wicket.request.http.WebRequest;import org.apache.wicket.request.mapper.parameter.PageParameters;import org.apache.wicket.request.resource.PackageResourceReference;import org.apache.wicket.util.crypt.Base64;@@ -59,6 +62,8 @@ public class MarkdownEditor extends FormComponentPanel<String> {private final boolean resizable;+ private final boolean initialSplit;+private WebMarkupContainer container;private TextArea<String> input;@@ -78,14 +83,33 @@ public class MarkdownEditor extends FormComponentPanel<String> {super(id, model);this.compactMode = compactMode;this.resizable = resizable;++ String cookieKey;+ if (compactMode)+ cookieKey = "markdownEditor.compactMode.split";+ else+ cookieKey = "markdownEditor.normalMode.split";++ WebRequest request = (WebRequest) RequestCycle.get().getRequest();+ Cookie cookie = request.getCookie(cookieKey);+ initialSplit = cookie!=null && "true".equals(cookie.getValue());}-+@Overrideprotected void onModelChanged() {super.onModelChanged();input.setModelObject(getModelObject());}+ private String render(String markdown) {+ if (StringUtils.isNotBlank(markdown)) {+ MarkdownManager markdownManager = GitPlex.getInstance(MarkdownManager.class);+ return markdownManager.render(markdown, true);+ } else {+ return "<div class='message'>Nothing to preview</div>";+ }+ }+@Overrideprotected void onInitialize() {super.onInitialize();@@ -98,17 +122,41 @@ public class MarkdownEditor extends FormComponentPanel<String> {container.add(new WebMarkupContainer("normalMode").setVisible(!compactMode));container.add(new WebMarkupContainer("compactMode").setVisible(compactMode));- WebMarkupContainer splitIcon = new WebMarkupContainer("splitIcon");- container.add(splitIcon);+ WebMarkupContainer editLink = new WebMarkupContainer("editLink");+ WebMarkupContainer splitLink = new WebMarkupContainer("splitLink");+ WebMarkupContainer preview = new WebMarkupContainer("preview");+ WebMarkupContainer edit = new WebMarkupContainer("edit");+ container.add(editLink);+ container.add(splitLink);+ container.add(preview);+ container.add(edit);++ 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"));- container.add(input = new TextArea<String>("input", Model.of(getModelObject())));+ edit.add(input = new TextArea<String>("input", Model.of(getModelObject())));for (AttributeModifier modifier: getInputModifiers()) {input.add(modifier);}++ if (initialSplit) {+ container.add(AttributeAppender.append("class", "split-mode"));+ preview.add(new Label("rendered", render(getModelObject())).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));@@ -127,13 +175,7 @@ public class MarkdownEditor extends FormComponentPanel<String> {switch (action) {case "render":String markdown = params.getParameterValue("param1").toString();- String rendered;- if (StringUtils.isNotBlank(markdown)) {- MarkdownManager markdownManager = GitPlex.getInstance(MarkdownManager.class);- rendered = markdownManager.render(markdown, true);- } else {- rendered = "<div class='message'>Nothing to preview</div>";- }+ String rendered = render(markdown);String script = String.format("gitplex.server.markdown.onRendered('%s', '%s');",container.getMarkupId(), JavaScriptEscape.escapeJavaScript(rendered));target.appendJavaScript(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.cssindex d565abff8c..e8783a6cf6 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@@ -77,7 +77,6 @@.markdown-editor>.body>.preview {float: left;width: 49%;- display: none;}.markdown-editor>.body>.preview>.markdown-rendered {overflow: auto;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.jsindex 120d040951..8690e35c27 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,55 +14,6 @@ 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, autosaveKey) {var $container = $("#" + containerId);@@ -79,7 +30,6 @@ gitplex.server.markdown = {var $preview = $body.children(".preview");var $rendered = $preview.children(".markdown-rendered");- $container.data("callback", callback);$container.data("autosaveKey", autosaveKey);$head.find(".dropdown>button").dropdown();@@ -94,7 +44,7 @@ gitplex.server.markdown = {$previewLink.removeClass("active");$splitLink.removeClass("active");$container.removeClass("preview-mode").removeClass("split-mode").addClass("edit-mode");- gitplex.server.markdown.onLayoutChange($container);+ onLayoutChange();Cookies.set(gitplex.server.markdown.getCookiePrefix($container)+".split", false, {expires: Infinity});});$previewLink.click(function() {@@ -121,13 +71,43 @@ gitplex.server.markdown = {$previewLink.addClass("active");$splitLink.removeClass("active");$container.removeClass("edit-mode").removeClass("split-mode").addClass("preview-mode");- gitplex.server.markdown.onLayoutChange($container);+ onLayoutChange();callback("render", $input.val());});$splitLink.click(function() {- gitplex.server.markdown.onSplit($container, true);+ $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());+ }+ }+ }+$input.doneEvents("input inserted.atwho", function() {if ($preview.is(":visible")) {callback("render", $input.val());@@ -642,10 +622,6 @@ gitplex.server.markdown = {}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");@@ -679,7 +655,7 @@ gitplex.server.markdown = {gitplex.server.markdown.syncPreviewScroll(containerId);- $rendered.find("img").load(function() {+ $rendered.find("img").on("load", function() {gitplex.server.markdown.syncPreviewScroll(containerId);});