⬆️ fix #3

88250 · Dec 29, 2019 · e4f67e5 · e4f67e5
1 parent 4ab8cd0
commit e4f67e5
Show file tree

Hide file tree

Showing 8 changed files with 105 additions and 978 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -37,6 +37,6 @@
     "gulp-uglify": "^3.0.2"
   },
   "dependencies": {
-    "vditor": "^1.10.0"
+    "vditor": "^2.0.3"
   }
 }
diff --git a/src/main/resources/css/base.css b/src/main/resources/css/base.css
diff --git a/src/main/resources/css/mobile-base.css b/src/main/resources/css/mobile-base.css
diff --git a/src/main/resources/js/common.js b/src/main/resources/js/common.js
@@ -669,7 +669,6 @@ var Util = {
       },
       lang: Label.langLabel,
       hint: {
-        emojiPath: Label.staticServePath + '/emoji/graphics',
         emojiTail: '<a href="' + Label.servePath +
           '/settings/function" target="_blank">设置常用表情</a>',
         emoji: Label.emoji,
@@ -711,21 +710,15 @@ var Util = {
     if ($(window).width() < 768) {
       options.toolbar = [
         'emoji',
-        'headings',
-        'quote',
-        '|',
+        'bold',
+        'italic',
+        'link',
         'list',
-        'ordered-list',
         'check',
-        '|',
         'upload',
-        'link',
-        'table',
-        'record',
-        '|',
-        'both',
+        'wysiwyg',
         'preview',
-        'info',
+        'fullscreen',
         'help',
       ]
       options.resize.enable = false

diff --git a/src/main/resources/js/common.min.js b/src/main/resources/js/common.min.js
diff --git a/src/main/resources/skins/classic/footer.ftl b/src/main/resources/skins/classic/footer.ftl
@@ -56,7 +56,7 @@
 
 <script src="${staticServePath}/js/symbol-defs${miniPostfix}.js?${staticResourceVersion}"></script>
 <script src="${staticServePath}/js/lib/compress/libs.min.js?${staticResourceVersion}"></script>
-<script src="https://cdn.jsdelivr.net/npm/vditor@1.10.0/dist/index.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/vditor@2.0.3/dist/index.min.js"></script>
 <script src="${staticServePath}/js/common${miniPostfix}.js?${staticResourceVersion}"></script>
 <script>
     var Label = {

diff --git a/src/main/resources/skins/mobile/footer.ftl b/src/main/resources/skins/mobile/footer.ftl
@@ -43,7 +43,7 @@
 </div>
 <script src="${staticServePath}/js/symbol-defs${miniPostfix}.js?${staticResourceVersion}"></script>
 <script src="${staticServePath}/js/lib/compress/libs.min.js?${staticResourceVersion}"></script>
-<script src="https://cdn.jsdelivr.net/npm/vditor@1.10.0/dist/index.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/vditor@2.0.3/dist/index.min.js"></script>
 <script src="${staticServePath}/js/common${miniPostfix}.js?${staticResourceVersion}"></script>
 <script>
   var Label = {