The Unified and Autonomous Development Platform
Refactor markdown editor to re-use modalpanel component when insert url
robin shencbde17650270
diff --git a/web/src/main/java/com/gitplex/server/web/component/markdown/InsertUrlPanel.java b/web/src/main/java/com/gitplex/server/web/component/markdown/InsertUrlPanel.javaindex ad3dd04135..4a6cda5fb0 100644--- a/web/src/main/java/com/gitplex/server/web/component/markdown/InsertUrlPanel.java+++ b/web/src/main/java/com/gitplex/server/web/component/markdown/InsertUrlPanel.java@@ -51,7 +51,7 @@ import com.gitplex.server.web.page.project.blob.render.BlobRenderContext;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;@SuppressWarnings("serial")-class InsertUrlPanel extends Panel {+abstract class InsertUrlPanel extends Panel {private static final MimetypesFileTypeMap MIME_TYPES = new MimetypesFileTypeMap();@@ -75,7 +75,7 @@ class InsertUrlPanel extends Panel {@Overridepublic void onClick(AjaxRequestTarget target) {- markdownEditor.closeUrlInserter(target, this);+ onClose(target);}});@@ -119,7 +119,7 @@ class InsertUrlPanel extends Panel {target.add(InsertUrlPanel.this);} else {markdownEditor.insertUrl(target, isImage, url, null, null);- markdownEditor.closeUrlInserter(target, InsertUrlPanel.this);+ onClose(target);}}@@ -197,7 +197,7 @@ class InsertUrlPanel extends Panel {relativePath = baseUrl;}markdownEditor.insertUrl(target, isImage, relativePath, blobIdent.getName(), null);- markdownEditor.closeUrlInserter(target, InsertUrlPanel.this);+ onClose(target);dropdown.close();}@@ -243,7 +243,7 @@ class InsertUrlPanel extends Panel {@Overridepublic void onClick(AjaxRequestTarget target) {markdownEditor.insertUrl(target, isImage, attachmentUrl, attachmentName, null);- markdownEditor.closeUrlInserter(target, InsertUrlPanel.this);+ onClose(target);}@Override@@ -315,7 +315,7 @@ class InsertUrlPanel extends Panel {}markdownEditor.insertUrl(target, isImage,attachmentSupport.getAttachmentUrl(attachmentName), attachmentName, null);- markdownEditor.closeUrlInserter(target, InsertUrlPanel.this);+ onClose(target);} else {error("Please select a non-empty file");target.add(InsertUrlPanel.this);@@ -340,4 +340,5 @@ class InsertUrlPanel extends Panel {setOutputMarkupId(true);}+ protected abstract void onClose(AjaxRequestTarget target);}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 4820d1b7fe..f4a1d806ab 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@@ -51,11 +51,12 @@ import com.gitplex.server.model.PullRequest;import com.gitplex.server.model.User;import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;import com.gitplex.server.web.component.markdown.emoji.EmojiOnes;-import com.gitplex.server.web.page.base.BasePage;+import com.gitplex.server.web.component.modal.ModalPanel;import com.gitplex.server.web.page.project.blob.ProjectBlobPage;import com.gitplex.server.web.page.project.blob.render.BlobRenderContext;import com.gitplex.server.web.util.avatar.AvatarManager;import com.google.common.base.Charsets;+import com.google.common.base.Preconditions;@SuppressWarnings("serial")public class MarkdownEditor extends FormComponentPanel<String> {@@ -317,13 +318,29 @@ public class MarkdownEditor extends FormComponentPanel<String> {break;case "selectImage":case "selectLink":- BasePage page = (BasePage) getPage();- InsertUrlPanel urlSelector = new InsertUrlPanel(- page.getRootComponents().newChildId(), MarkdownEditor.this, action.equals("selectImage"));- urlSelector.setOutputMarkupId(true);- page.getRootComponents().add(urlSelector);- urlSelector.setMarkupId(container.getMarkupId() + "-urlselector");- target.add(urlSelector);+ new ModalPanel(target) {++ @Override+ protected Component newContent(String id) {+ return new InsertUrlPanel(id, MarkdownEditor.this, action.equals("selectImage")) {++ @Override+ protected void onClose(AjaxRequestTarget target) {+ close();+ }++ };+ }++ @Override+ protected void onClosed() {+ super.onClosed();+ AjaxRequestTarget target =+ Preconditions.checkNotNull(RequestCycle.get().find(AjaxRequestTarget.class));+ target.appendJavaScript(String.format("$('#%s textarea').focus();", container.getMarkupId()));+ }++ };break;case "insertUrl":String name;@@ -401,13 +418,6 @@ public class MarkdownEditor extends FormComponentPanel<String> {target.appendJavaScript(script);}- public void closeUrlInserter(AjaxRequestTarget target, Component urlInserter) {- BasePage page = (BasePage) urlInserter.getPage();- page.getRootComponents().remove(urlInserter);- String script = String.format("$('#%s-urlselector').closest('.modal').modal('hide');", container.getMarkupId());- target.appendJavaScript(script);- }-public boolean isWebSafeImage(String fileName) {fileName = fileName.toLowerCase();return fileName.endsWith(".jpg") || fileName.endsWith(".jpeg")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 f10108aea3..2dc443b89f 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@@ -304,33 +304,6 @@ gitplex.server.markdown = {gitplex.server.markdown.autofit(containerId, width, height);});- function onSelectUrl(isImage) {- var $modal = $("" +- "<div class='modal'>" +- "<div class='modal-dialog'>" +- "<div class='modal-content'>" +- "<div id='" + containerId + "-urlselector'></div>" +- "</div>" +- "</div>" +- "</div>");- // Make sure to append to body to avoid z-index issues causing modal to sit in background- $("body").append($modal);- $modal.modal({show: true, backdrop: "static", keyboard: false});- $modal.on('hidden.bs.modal', function (e) {- $modal.remove();- $input.focus();- });- $modal.keyup(function(e) {- if (e.keyCode == 27) {- $modal.modal("hide");- }- });- if (isImage)- callback("selectImage");- else- callback("selectLink");- }-$head.find(".do-bold").click(function() {var selected = $input.range();if (selected.length != 0) {@@ -524,7 +497,10 @@ gitplex.server.markdown = {});$head.find(".do-image, .do-link").click(function() {- onSelectUrl($(this).hasClass("do-image"));+ if ($(this).hasClass("do-image"))+ callback("selectImage");+ else+ callback("selectLink");});$input[0].cachedEmojis = [];