The Unified and Autonomous Development Platform
Add hot key to insert link/image in markdown
Robin Shenabdb57cbdabe
diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/MarkdownEditor.html b/web/src/main/java/com/turbodev/server/web/component/markdown/MarkdownEditor.htmlindex d109dc7ecb..ec0d5a2539 100644--- a/web/src/main/java/com/turbodev/server/web/component/markdown/MarkdownEditor.html+++ b/web/src/main/java/com/turbodev/server/web/component/markdown/MarkdownEditor.html@@ -7,8 +7,8 @@<a class="do-italic pull-left" title="Italic"><i class="fa fa-italic"></i></a><a class="do-header pull-left" title="Heading"><i class="fa fa-header"></i></a><span class="separator pull-left"></span>- <a class="do-link pull-left" title="Link"><i class="fa fa-link"></i></a>- <a class="do-image pull-left" title="Image"><i class="fa fa-picture-o"></i></a>+ <a class="do-link pull-left" title="Link (Ctrl-L)"><i class="fa fa-link"></i></a>+ <a class="do-image pull-left" title="Image (Ctrl-I)"><i class="fa fa-picture-o"></i></a><span class="separator pull-left"></span><a class="do-list pull-left" title="Unordered List"><i class="fa fa-list"></i></a><a class="do-orderlist pull-left" title="Ordered List"><i class="fa fa-list-ol"></i></a>@@ -27,8 +27,8 @@<li><a class="do-italic"><i class="fa fa-italic fa-fw"></i> Italic</a></li><li><a class="do-header"><i class="fa fa-header fa-fw"></i> Heading</a></li><li role="separator" class="divider"></li>- <li><a class="do-link"><i class="fa fa-link fa-fw"></i> Link</a></li>- <li><a class="do-image"><i class="fa fa-picture-o fa-fw"></i> Image</a></li>+ <li><a class="do-link"><i class="fa fa-link fa-fw"></i> Link <span class="pull-right">Ctrl-L</span></a></li>+ <li><a class="do-image"><i class="fa fa-picture-o fa-fw"></i> Image <span class="pull-right">Ctrl-I</span></a></li><li role="separator" class="divider"></li><li><a class="do-list"><i class="fa fa-list fa-fw"></i> Unordered List</a></li><li><a class="do-orderlist"><i class="fa fa-list-ol fa-fw"></i> Ordered List</a></li>diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/MarkdownResourceReference.java b/web/src/main/java/com/turbodev/server/web/component/markdown/MarkdownResourceReference.javaindex a82c9bbadc..761ace117c 100644--- a/web/src/main/java/com/turbodev/server/web/component/markdown/MarkdownResourceReference.java+++ b/web/src/main/java/com/turbodev/server/web/component/markdown/MarkdownResourceReference.java@@ -11,6 +11,7 @@ import com.turbodev.server.web.asset.caret.CaretResourceReference;import com.turbodev.server.web.asset.codemirror.CodeMirrorResourceReference;import com.turbodev.server.web.asset.cookies.CookiesResourceReference;import com.turbodev.server.web.asset.doneevents.DoneEventsResourceReference;+import com.turbodev.server.web.asset.hotkeys.HotkeysResourceReference;import com.turbodev.server.web.asset.jqueryui.JQueryUIResourceReference;import com.turbodev.server.web.asset.textareacaretposition.TextareaCaretPositionResourceReference;import com.turbodev.server.web.page.base.BaseDependentCssResourceReference;@@ -32,6 +33,7 @@ public class MarkdownResourceReference extends BaseDependentResourceReference {dependencies.add(JavaScriptHeaderItem.forReference(new TextareaCaretPositionResourceReference()));dependencies.add(JavaScriptHeaderItem.forReference(new DoneEventsResourceReference()));dependencies.add(JavaScriptHeaderItem.forReference(new CookiesResourceReference()));+ dependencies.add(JavaScriptHeaderItem.forReference(new HotkeysResourceReference()));dependencies.add(JavaScriptHeaderItem.forReference(new JQueryUIResourceReference()));dependencies.add(CssHeaderItem.forReference(diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/markdown.css b/web/src/main/java/com/turbodev/server/web/component/markdown/markdown.cssindex 4cb8772924..8ec3eebd3e 100644--- a/web/src/main/java/com/turbodev/server/web/component/markdown/markdown.css+++ b/web/src/main/java/com/turbodev/server/web/component/markdown/markdown.css@@ -177,6 +177,9 @@ body.fullscreen {border-left: none;border-radius: 0 0 4px 0;}+.compact-mode.dropdown a {+ font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;+}.atwho-view .emoji {display: inline-block;diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/markdown.js b/web/src/main/java/com/turbodev/server/web/component/markdown/markdown.jsindex 29d64adb25..f4903e568b 100644--- a/web/src/main/java/com/turbodev/server/web/component/markdown/markdown.js+++ b/web/src/main/java/com/turbodev/server/web/component/markdown/markdown.js@@ -520,7 +520,17 @@ turbodev.server.markdown = {elsecallback("selectLink");});-++ $input.on("keydown", function(e) {+ if ((e.ctrlKey|e.metaKey) && e.keyCode == 76) {+ e.preventDefault();+ callback("selectLink");+ } else if ((e.ctrlKey|e.metaKey) && e.keyCode == 73) {+ e.preventDefault();+ callback("selectImage");+ }+ });+$input[0].cachedEmojis = [];$input.atwho({diff --git a/web/src/main/java/com/turbodev/server/web/page/base/base.js b/web/src/main/java/com/turbodev/server/web/page/base/base.jsindex 9f5f5f85fe..1aea740a34 100644--- a/web/src/main/java/com/turbodev/server/web/page/base/base.js+++ b/web/src/main/java/com/turbodev/server/web/page/base/base.js@@ -544,9 +544,9 @@ turbodev.server = {return navigator.userAgent.indexOf('Mac') != -1;},describeUrl: function(url) {- if (url.startsWith("http://"))+ if (url.indexOf("http://") == 0)return url.substring("http://".length);- if (url.startsWith("https://"))+ if (url.indexOf("https://") == 0)return url.substring("https://".length);var index = url.lastIndexOf("/");