From bee47ff1778ce7b1a325858da05b955cd8ba9ea5 Mon Sep 17 00:00:00 2001 From: yangjian Date: Wed, 20 May 2020 06:47:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96Markdown=E6=89=A9=E5=B1=95?= =?UTF-8?q?=E8=AF=AD=E6=B3=95=E6=AD=A3=E5=88=99=E5=8C=B9=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static/editor.md/editormd.js | 3 ++- template/app_doc/create_base_2.html | 5 ++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/static/editor.md/editormd.js b/static/editor.md/editormd.js index 28838ad..8928a67 100644 --- a/static/editor.md/editormd.js +++ b/static/editor.md/editormd.js @@ -3382,7 +3382,8 @@ atLink : /@(\w+)/g, email : /(\w+)@(\w+)\.(\w+)\.?(\w+)?/g, emailLink : /(mailto:)?([\w\.\_]+)@(\w+)\.(\w+)\.?(\w+)?/g, - emoji : /:([\w\+-]+):/g, + //emoji : /:([\w\+-]+):/g, + emoji : /:([A-Za-z]+):/g, emojiDatetime : /(\d{2}:\d{2}:\d{2})/g, twemoji : /:(tw-([\w]+)-?(\w+)?):/g, fontAwesome : /:(fa-([\w]+)(-(\w+)){0,}):/g, diff --git a/template/app_doc/create_base_2.html b/template/app_doc/create_base_2.html index 4aeb222..5c25cb9 100644 --- a/template/app_doc/create_base_2.html +++ b/template/app_doc/create_base_2.html @@ -240,10 +240,9 @@ toolbarIcons : function() { return [ "undo", "redo", "|", - "bold", "del", "italic", "quote","kaiSpan", "|", - "h1", "h2", "h3", "|", + "h1", "bold", "del", "italic", "quote","kaiSpan", "|", "list-ul", "list-ol", "hr", "link", "reference-link", "|", - "mindmap","imgUpload", "attachment" ,"code", "code-block", "htmltable", "|","datetime", "emoji", "html-entities", "pagebreak", "|", + "mindmap","imgUpload", "attachment" ,"code", "code-block", "htmltable", "|", "emoji", "html-entities", "pagebreak", "|", "watch", "preview", "|", "help" ]