The Unified and Autonomous Development Platform
Markdown editor improvements
Robin Shencacfd38fc755
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/atwho/AtWhoResourceReference.java b/server-core/src/main/java/io/onedev/server/web/asset/atwho/AtWhoResourceReference.javaindex 07617f8bde..263d68f5de 100644--- a/server-core/src/main/java/io/onedev/server/web/asset/atwho/AtWhoResourceReference.java+++ b/server-core/src/main/java/io/onedev/server/web/asset/atwho/AtWhoResourceReference.java@@ -10,6 +10,8 @@ import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.request.resource.CssResourceReference;import org.apache.wicket.request.resource.JavaScriptResourceReference;+import io.onedev.server.web.asset.caret.CaretResourceReference;+public class AtWhoResourceReference extends JavaScriptResourceReference {private static final long serialVersionUID = 1L;@@ -22,6 +24,7 @@ public class AtWhoResourceReference extends JavaScriptResourceReference {public List<HeaderItem> getDependencies() {List<HeaderItem> dependencies = new ArrayList<>();dependencies.add(JavaScriptHeaderItem.forReference(Application.get().getJavaScriptLibrarySettings().getJQueryReference()));+ dependencies.add(JavaScriptHeaderItem.forReference(new CaretResourceReference()));dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(AtWhoResourceReference.class, "jquery.atwho-caret.js")));dependencies.add(CssHeaderItem.forReference(new CssResourceReference(diff --git a/server-core/src/main/java/io/onedev/server/web/asset/atwho/jquery.atwho.js b/server-core/src/main/java/io/onedev/server/web/asset/atwho/jquery.atwho.jsindex 03e41359df..9b8e23ed57 100644--- a/server-core/src/main/java/io/onedev/server/web/asset/atwho/jquery.atwho.js+++ b/server-core/src/main/java/io/onedev/server/web/asset/atwho/jquery.atwho.js@@ -511,20 +511,11 @@ TextareaController = (function(superClass) {};TextareaController.prototype.insert = function(content, $li) {- var $inputor, source, startStr, suffix, text;+ var $inputor;$inputor = this.$inputor;- source = $inputor.val();- startStr = source.slice(0, Math.max(this.query.headPos - this.at.length, 0));- suffix = (suffix = this.getOpt('suffix')) === "" ? suffix : suffix || " ";- content += suffix;- text = "" + startStr + content + (source.slice(this.query['endPos'] || 0));- $inputor.val(text);- $inputor.atwhocaret('pos', startStr.length + content.length, {- iframe: this.app.iframe- });- if (!$inputor.is(':focus')) {- $inputor.focus();- }+ $inputor.focus();+ $inputor.range(Math.max(this.query.headPos - this.at.length, 0), $inputor.caret());+ document.execCommand("insertText", false, content);return $inputor.change();};diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.htmlindex edcd8e82c2..cf06d5e4c4 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.html@@ -18,7 +18,7 @@<div wicket:id="feedback"></div><div wicket:id="comment" placeholder="Leave a comment"></div><div class="mt-3">- <button wicket:id="save" class="btn btn-primary dirty-aware">Comment</button>+ <button wicket:id="save" type="submit" class="btn btn-primary dirty-aware">Comment</button></div></form></wicket:fragment>diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.javaindex 4176e57b62..cc74c9b146 100644--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.java@@ -93,9 +93,9 @@ abstract class InsertUrlPanel extends Panel {private Collection<FileUpload> uploads = new ArrayList<>();- private String url;+ private String linkUrl;- private String text;+ private String linkText;private String commitMessage;@@ -103,10 +103,12 @@ abstract class InsertUrlPanel extends Panel {private final boolean isImage;- public InsertUrlPanel(String id, MarkdownEditor markdownEditor, boolean isImage) {+ public InsertUrlPanel(String id, MarkdownEditor markdownEditor, String linkText, boolean isImage) {super(id);this.markdownEditor = markdownEditor;this.isImage = isImage;+ if (StringUtils.isNotBlank(linkText))+ this.linkText = linkText;}private Component newInputUrlPanel() {@@ -126,26 +128,26 @@ abstract class InsertUrlPanel extends Panel {form.add(new Label("urlLabel", isImage?"Image URL":"Link URL"));form.add(new Label("urlHelp", isImage?"Absolute or relative url of the image":"Absolute or relative url of the link"));- form.add(new TextField<String>("url", new PropertyModel<String>(this, "url")));+ form.add(new TextField<String>("url", new PropertyModel<String>(this, "linkUrl")));form.add(new Label("textLabel", isImage?"Image Text": "Link Text"));- form.add(new TextField<String>("text", new PropertyModel<String>(this, "text")));+ form.add(new TextField<String>("text", new PropertyModel<String>(this, "linkText")));form.add(new AjaxButton("insert", form) {@Overrideprotected void onSubmit(AjaxRequestTarget target, Form<?> form) {super.onSubmit(target, form);- if (StringUtils.isBlank(url)) {+ if (StringUtils.isBlank(linkUrl)) {if (isImage)error("Image URL should be specified");elseerror("Link URL should be specified");target.add(fragment);} else {- if (text == null)- text = UrlUtils.describe(url);- markdownEditor.insertUrl(target, isImage, url, text, null);+ if (linkText == null)+ linkText = UrlUtils.describe(linkUrl);+ markdownEditor.insertUrl(target, isImage, linkUrl, linkText, null);onClose(target);}}@@ -236,8 +238,8 @@ abstract class InsertUrlPanel extends Panel {String baseUrl = context.getDirectoryUrl();String referenceUrl = urlFor(ProjectBlobPage.class,ProjectBlobPage.paramsOf(context.getProject(), blobIdent)).toString();- String relativized = PathUtils.relativize(baseUrl, referenceUrl);- markdownEditor.insertUrl(target, isImage, relativized, blobIdent.getName(), null);+ String relativized = PathUtils.relativize(baseUrl, referenceUrl);+ markdownEditor.insertUrl(target, isImage, relativized, linkText!=null?linkText:blobIdent.getName(), null);onClose(target);}@@ -292,7 +294,8 @@ abstract class InsertUrlPanel extends Panel {@Overridepublic void onClick(AjaxRequestTarget target) {- markdownEditor.insertUrl(target, true, attachmentUrl, attachmentName, null);+ markdownEditor.insertUrl(target, true, attachmentUrl,+ linkText!=null?linkText:attachmentName, null);onClose(target);}@@ -345,7 +348,8 @@ abstract class InsertUrlPanel extends Panel {@Overridepublic void onClick(AjaxRequestTarget target) {- markdownEditor.insertUrl(target, false, attachmentUrl, attachmentName, null);+ markdownEditor.insertUrl(target, false, attachmentUrl,+ linkText!=null?linkText:attachmentName, null);onClose(target);}@@ -408,7 +412,8 @@ abstract class InsertUrlPanel extends Panel {throw new RuntimeException(e);}markdownEditor.insertUrl(target, isImage,- attachmentSupport.getAttachmentUrlPath(attachmentName), attachmentName, null);+ attachmentSupport.getAttachmentUrlPath(attachmentName),+ linkText!=null?linkText:attachmentName, null);onClose(target);}@@ -539,7 +544,7 @@ abstract class InsertUrlPanel extends Panel {url = StringUtils.stripEnd(directory, "/") + "/" + UrlUtils.encodePath(fileName);elseurl = UrlUtils.encodePath(fileName);- markdownEditor.insertUrl(target, isImage, url, fileName, null);+ markdownEditor.insertUrl(target, isImage, url, linkText!=null?linkText:fileName, null);for (FileUpload upload: uploads)upload.release();onClose(target);@@ -643,6 +648,6 @@ abstract class InsertUrlPanel extends Panel {});}-+protected abstract void onClose(AjaxRequestTarget target);}diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.html b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.htmlindex 43ef387696..51f7b31e61 100644--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.html+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.html@@ -7,8 +7,8 @@<a class="do-italic" title="Italic"><wicket:svg href="italic" class="icon"></wicket:svg></a><a class="do-header" title="Heading"><wicket:svg href="header" class="icon"></wicket:svg></a><span class="separator"></span>- <a class="do-link" title="Link (Ctrl-L)"><wicket:svg href="link" class="icon"></wicket:svg></a>- <a class="do-image" title="Image (Ctrl-I)"><wicket:svg href="image" class="icon"></wicket:svg></a>+ <a class="do-link" title="Link"><wicket:svg href="link" class="icon"></wicket:svg></a>+ <a class="do-image" title="Image"><wicket:svg href="image" class="icon"></wicket:svg></a><span class="separator"></span><a class="do-list" title="Unordered list"><wicket:svg href="unordered-list" class="icon"></wicket:svg></a><a class="do-orderlist" title="Ordered list"><wicket:svg href="ordered-list" class="icon"></wicket:svg></a>@@ -64,8 +64,8 @@<a class="dropdown-item do-italic"><wicket:svg href="italic" class="icon mr-1"></wicket:svg> Italic</a><a class="dropdown-item do-header"><wicket:svg href="header" class="icon mr-1"></wicket:svg> Heading</a><div class="dropdown-divider"></div>- <a class="dropdown-item do-link"><wicket:svg href="link" class="icon mr-1"></wicket:svg> Link <span class="float-right">Ctrl-L</span></a>- <a class="dropdown-item do-image"><wicket:svg href="image" class="icon mr-1"></wicket:svg> Image <span class="float-right">Ctrl-I</span></a>+ <a class="dropdown-item do-link"><wicket:svg href="link" class="icon mr-1"></wicket:svg> Link</a>+ <a class="dropdown-item do-image"><wicket:svg href="image" class="icon mr-1"></wicket:svg> Image</a><div class="dropdown-divider"></div><a class="dropdown-item do-list"><wicket:svg href="unordered-list" class="icon mr-1"></wicket:svg> Unordered List</a><a class="dropdown-item do-orderlist"><wicket:svg href="ordered-list" class="icon mr-1"></wicket:svg> Ordered List</a>diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.javaindex 8d1157d557..672611989a 100644--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java@@ -412,17 +412,18 @@ public class MarkdownEditor extends FormComponentPanel<String> {break;case "selectImage":case "selectLink":+ String selectedText = params.getParameterValue("param1").toOptionalString();new ModalPanel(target) {@Overrideprotected Component newContent(String id) {- return new InsertUrlPanel(id, MarkdownEditor.this, action.equals("selectImage")) {+ return new InsertUrlPanel(id, MarkdownEditor.this, selectedText, action.equals("selectImage")) {@Overrideprotected void onClose(AjaxRequestTarget target) {close();}-+};}@@ -564,7 +565,7 @@ public class MarkdownEditor extends FormComponentPanel<String> {protected String getAutosaveKey() {return null;}-+@Nullablepublic BlobRenderContext getBlobRenderContext() {return blobRenderContext;diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.js b/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.jsindex 48b9279fd0..4db74cc8e6 100644--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.js+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.js@@ -1,4 +1,14 @@onedev.server.markdown = {+ shortcuts: { // cmd (Mac) or ctrl (non-Mac) plus below keys+ "b": ".do-bold",+ "k": ".do-link",+ "i": ".do-italic",+ "e": ".do-code",+ "shift-.": ".do-quote",+ "shift-7": ".do-orderlist",+ "shift-8": ".do-list",+ "shift-9": ".do-tasklist" // this does not conform to github as ctrl-shift-l is occupied in MS Edge+ },getCookiePrefix: function($container) {if ($container.hasClass("compact-mode"))return "markdownEditor.compactMode";@@ -31,7 +41,7 @@ onedev.server.markdown = {var $preview = $body.children(".preview");var $rendered = $preview.children(".markdown-rendered");var $help = $head.children(".help");-+$head.find(".dropdown>a").dropdown();$editLink.click(function() {@@ -120,6 +130,10 @@ onedev.server.markdown = {}}, previewTimeout);+ var $submit = $input.closest("form")+ .find(">.btn-primary, :last-child>.btn-primary")+ .not("[disabled=disabled]");+var fontSize = parseInt(getComputedStyle($input[0]).getPropertyValue('font-size'));/*@@ -157,6 +171,9 @@ onedev.server.markdown = {*/$input.on("keydown", function(e) {if (e.keyCode == 13 && $(".atwho-view").filter(":visible").length == 0) {+ if ((e.metaKey || e.ctrlKey) && $submit.length != 0)+ return;+e.preventDefault();var input = $input.val();var caret = $input.caret();@@ -176,14 +193,8 @@ onedev.server.markdown = {var nonSpaceInCurrentLine = input.substring(nonSpacePosInCurrentLine, caret);function clearLastLine() {- var newInputBeforeCaret;- if (lastLineBreakPos != -1) {- newInputBeforeCaret = input.substring(0, lastLineBreakPos) + "\n\n";- } else {- newInputBeforeCaret = "\n";- }- $input.val(newInputBeforeCaret + inputAfterCaret);- $input.caret(newInputBeforeCaret.length);+ $input.range(lastLineBreakPos+1, caret);+ document.execCommand("insertText", false, "\n");}// match against task items@@ -191,22 +202,22 @@ onedev.server.markdown = {if (match != null) {if (nonSpaceInCurrentLine.length > match[0].length) {if (nonSpaceInCurrentLine.indexOf("*") == 0)- $input.caret("\n" + spaces + "* [ ] ");+ document.execCommand("insertText", false, "\n" + spaces + "* [ ] ");else- $input.caret("\n" + spaces + "- [ ] ");+ document.execCommand("insertText", false, "\n" + spaces + "- [ ] ");} else {clearLastLine();}} else {if (nonSpaceInCurrentLine.indexOf("* ") == 0) {if (nonSpaceInCurrentLine.length > 2) {- $input.caret("\n" + spaces + "* ");+ document.execCommand("insertText", false, "\n" + spaces + "* ");} else {clearLastLine();}} else if (nonSpaceInCurrentLine.indexOf("- ") == 0) {if (nonSpaceInCurrentLine.length > 2) {- $input.caret("\n" + spaces + "- ");+ document.execCommand("insertText", false, "\n" + spaces + "- ");} else {clearLastLine();}@@ -215,14 +226,14 @@ onedev.server.markdown = {match = /^\d+\. /.exec(nonSpaceInCurrentLine);if (match != null) {if (nonSpaceInCurrentLine.length > match[0].length) {- $input.caret("\n" + spaces + (parseInt(match[0])+1) +". ");+ document.execCommand("insertText", false, "\n" + spaces + (parseInt(match[0])+1) +". ");} else {clearLastLine();}} else if (nonSpacePosInCurrentLine == inputBeforeCaret.length) {- $input.caret("\n");+ document.execCommand("insertText", false, "\n");} else {- $input.caret("\n" + spaces);+ document.execCommand("insertText", false, "\n" + spaces);}}}@@ -232,8 +243,6 @@ onedev.server.markdown = {if (caretBottom > $input.scrollTop() + $input.height()) {$input.scrollTop(caretBottom - $input.height());}-- onedev.server.markdown.fireInputEvent($input);}});@@ -323,14 +332,28 @@ onedev.server.markdown = {$input.on("keydown", function(e) {if ($(".atwho-view").filter(":visible").length == 0) {- if ((e.ctrlKey|e.metaKey) && e.keyCode == 76) {- e.preventDefault();- callback("selectLink");- } else if ((e.ctrlKey|e.metaKey) && e.keyCode == 73) {+ if (onedev.server.util.isMac() && e.metaKey || !onedev.server.util.isMac() && e.ctrlKey) {+ var key;+ if (e.keyCode >= 48 && e.keyCode <= 57)+ key = String.fromCharCode(e.keyCode);+ else if (e.keyCode >= 65 && e.keyCode <= 90)+ key = String.fromCharCode(e.keyCode+32);+ else if (e.keyCode == 190)+ key = ".";+ else+ key = "";+ if (e.shiftKey)+ key = "shift-" + key;+ var selector = onedev.server.markdown.shortcuts[key];+ if (selector)+ $head.find(selector).click();+ }+ if ((e.metaKey || e.ctrlKey) && e.keyCode == 13 && $submit.length != 0) {e.preventDefault();- callback("selectImage");- }+ $submit.click();+ }}+});$input[0].cachedEmojis = [];@@ -475,9 +498,9 @@ onedev.server.markdown = {xhr.replaceMessage = message;if ($input.range().length == 0) {- $input.caret(message);+ document.execCommand("insertText", false, message);} else {- $input.range(message);+ document.execCommand("insertText", false, message);$input.caret($input.caret()+message.length);}@@ -595,42 +618,49 @@ onedev.server.markdown = {}$actionMenu.find(".do-bold").click(function() {+ $input.focus();var selected = $input.range();if (selected.length != 0) {- $input.range("**" + selected.text + "**").range(selected.start+2, selected.end+2);+ document.execCommand("insertText", false, "**" + selected.text + "**");+ $input.range(selected.start+2, selected.end+2);} else {- $input.range("**strong text**").range(selected.start+2, selected.end+2+"strong text".length);+ document.execCommand("insertText", false, "**strong text**");+ $input.range(selected.start+2, selected.end+2+"strong text".length);}- $input.focus();+ closeMenu();onedev.server.markdown.fireInputEvent($input);- closeMenu();});$actionMenu.find(".do-italic").click(function() {+ $input.focus();var selected = $input.range();if (selected.length != 0) {- $input.range("_" + selected.text + "_").range(selected.start+1, selected.end+1);+ document.execCommand("insertText", false, "_" + selected.text + "_");+ $input.range(selected.start+1, selected.end+1);} else {- $input.range("_emphasized text_").range(selected.start+1, selected.end+1+"emphasized text".length);+ document.execCommand("insertText", false, "_emphasized text_");+ $input.range(selected.start+1, selected.end+1+"emphasized text".length);}- $input.focus();- onedev.server.markdown.fireInputEvent($input);closeMenu();+ onedev.server.markdown.fireInputEvent($input);});$actionMenu.find(".do-header").click(function() {+ $input.focus();var selected = $input.range();if (selected.length != 0) {- $input.range("### " + selected.text).range(selected.start+4, selected.end+4);+ document.execCommand("insertText", false, "### " + selected.text);+ $input.range(selected.start+4, selected.end+4);} else {- $input.range("### heading text").range(selected.start+4, selected.end+4+"heading text".length);+ document.execCommand("insertText", false, "### heading text");+ $input.range(selected.start+4, selected.end+4+"heading text".length);}- $input.focus();- onedev.server.markdown.fireInputEvent($input);closeMenu();+ onedev.server.markdown.fireInputEvent($input);});$actionMenu.find(".do-list, .do-orderlist, .do-tasklist").click(function() {+ $input.focus();var leading;if ($(this).hasClass("do-list"))leading = "-";@@ -647,42 +677,48 @@ onedev.server.markdown = {insert += "\n";insert += leading + " " + splitted[i];}- $input.range(insert).range(selected.start+leading.length+1, selected.start+leading.length+1+splitted[0].length);+ document.execCommand("insertText", false, insert);+ //$input.range(selected.start+leading.length+1, selected.start+leading.length+1+splitted[0].length);} else {var text;if ($(this).hasClass("do-tasklist"))text = " task text here";elsetext = " list text here";- $input.range(leading + text).range(selected.start+leading.length+1, selected.start+leading.length+1+text.length);+ document.execCommand("insertText", false, leading + text);+ $input.range(selected.start+leading.length+1, selected.start+leading.length+1+text.length);}- $input.focus();- onedev.server.markdown.fireInputEvent($input);closeMenu();+ onedev.server.markdown.fireInputEvent($input);});$actionMenu.find(".do-code").click(function() {+ $input.focus();var langHint = "programming language";var selected = $input.range();if (selected.length != 0) {- $input.range("\n```" + langHint + "\n" + selected.text + "\n```\n").range(selected.start+4, selected.start+4+langHint.length);+ document.execCommand("insertText", false, "\n```" + langHint + "\n" + selected.text + "\n```\n");+ $input.range(selected.start+4, selected.start+4+langHint.length);} else {- $input.range("\n```" + langHint + "\ncode text here\n```\n").range(selected.start+4, selected.start+4+langHint.length);+ document.execCommand("insertText", false, "\n```" + langHint + "\n```\n");+ $input.range(selected.start+4, selected.start+4+langHint.length);}- $input.focus();- onedev.server.markdown.fireInputEvent($input);closeMenu();+ onedev.server.markdown.fireInputEvent($input);});$actionMenu.find(".do-quote").click(function() {- var selected = $input.range();- if (selected.length != 0)- $input.range("> " + selected.text).range(selected.start+2, selected.end+2);- else- $input.range("> quote here").range(selected.start+2, selected.start+2+"quote here".length);$input.focus();- onedev.server.markdown.fireInputEvent($input);+ var selected = $input.range();+ if (selected.length != 0) {+ document.execCommand("insertText", false, "> " + selected.text);+ $input.range(selected.start+2, selected.end+2);+ } else {+ document.execCommand("insertText", false, "> quote here");+ $input.range(selected.start+2, selected.start+2+"quote here".length);+ }closeMenu();+ onedev.server.markdown.fireInputEvent($input);});$actionMenu.find(".do-emoji").click(function() {@@ -714,22 +750,34 @@ onedev.server.markdown = {elseprefix = prefix + " ";+ $input.focus();+if (prevChar === undefined || prevChar === ' ' || prevChar === '\n')- $input.caret(prefix + atChar);+ document.execCommand("insertText", false, prefix + atChar);else- $input.caret(" " + prefix + atChar);+ document.execCommand("insertText", false, " " + prefix + atChar);+ onedev.server.markdown.fireInputEvent($input);$input.atwho("run");- onedev.server.markdown.fireInputEvent($input);});$actionMenu.find(".do-image, .do-link").click(function() {if ($(this).hasClass("do-image"))- callback("selectImage");+ callback("selectImage", $input.range().text);else- callback("selectLink");+ callback("selectLink", $input.range().text);closeMenu();});++ var prefix = onedev.server.util.isMac()?"cmd-":"ctrl-";+ for (var key in onedev.server.markdown.shortcuts) {+ var selector = onedev.server.markdown.shortcuts[key];+ var $action = $actionMenu.find(selector);+ if ($actionMenu.closest(".floating").length != 0)+ $action.append("<span class='float-right'>" + prefix + key + "</span>");+ else+ $action.attr("title", $action.attr("title") + " (" + prefix + key + ")");+ }},onLoad: function(containerId) {var $container = $("#" + containerId);@@ -995,8 +1043,8 @@ onedev.server.markdown = {$emojis.find(".emoji").click(function() {if (!$edit.is(":visible"))return;-- $input.caret(":" + $(this).attr("title") + ": ");+ $input.focus();+ document.execCommand("insertText", false, ":" + $(this).attr("title") + ": ");onedev.server.markdown.fireInputEvent($input);});},@@ -1021,15 +1069,15 @@ onedev.server.markdown = {var offset = isImage?2:1;$input.range($input.caret()-message.length+offset, $input.caret()-message.length+defaultDescription.length+offset);}-- onedev.server.markdown.fireInputEvent($input);},updateUploadMessage: function($input, message, replaceMessage) {+ $input.focus();var isError = message.indexOf("!!") == 0;var pos = $input.val().indexOf(replaceMessage);if (pos != -1) {var currentPos = $input.caret();- $input.range(pos, pos+ replaceMessage.length).range(message);+ $input.range(pos, pos+ replaceMessage.length);+ document.execCommand("insertText", false, message);if (!isError) {if (currentPos<pos)$input.caret(currentPos);@@ -1040,16 +1088,16 @@ onedev.server.markdown = {}} else {if ($input.range().length != 0) {- $input.range(message);+ document.execCommand("insertText", false, message);if (!isError)$input.caret($input.caret() + message.length);} else {- // use range instead of caret here as otherwise the editor will be scrolled to the bottom- $input.range(message);+ document.execCommand("insertText", false, message);if (isError)$input.range($input.caret()-message.length, $input.caret());}}+ onedev.server.markdown.fireInputEvent($input);},onInputUrlDomReady: function(containerId) {var $container = $("#"+containerId);