2
0
Эх сурвалжийг харах

Added back Summernote editor. Removed emoji picker.

Thanks to ryanMushy and xet7 !

Related https://github.com/wekan/wekan/commit/84fde1ecfc81e89ed1895cab3bcb328e4f166a87#commitcomment-48956373
Lauri Ojansivu 4 жил өмнө
parent
commit
47ecc654b8

+ 1 - 1
.meteor/packages

@@ -144,4 +144,4 @@ rajit:bootstrap3-datepicker-zh-cn
 rajit:bootstrap3-datepicker-zh-tw
 staringatlights:fast-render
 spacebars
-georgemccann:meteor-emoji-picker
+easylogic:summernote

+ 2 - 1
.meteor/versions

@@ -56,6 +56,7 @@ ddp-server@2.3.2
 deps@1.0.12
 diff-sequence@1.1.1
 dynamic-import@0.6.0
+easylogic:summernote@0.8.8
 ecmascript@0.15.0
 ecmascript-runtime@0.7.0
 ecmascript-runtime-client@0.11.0
@@ -67,7 +68,6 @@ fastclick@1.0.13
 fetch@0.1.1
 fortawesome:fontawesome@4.7.0
 geojson-utils@1.0.10
-georgemccann:meteor-emoji-picker@0.1.74
 horka:swipebox@1.0.2
 hot-code-push@1.0.4
 html-tools@1.0.11
@@ -226,6 +226,7 @@ templating-runtime@1.3.2
 templating-tools@1.1.2
 tmeasday:check-npm-versions@0.3.2
 tracker@1.2.0
+twbs:bootstrap@3.3.6
 ui@1.0.13
 underscore@1.0.10
 url@1.3.1

+ 0 - 1
client/components/main/editor.jade

@@ -4,7 +4,6 @@ template(name="editor")
     class="{{class}}"
     id=id
     autofocus=autofocus
-    data-meteor-emoji="true"
     placeholder="{{_ 'comment-placeholder'}}")
     +Template.contentBlock
 

+ 1 - 5
client/components/main/editor.js

@@ -1,5 +1,4 @@
 Template.editor.onRendered(() => {
-  new MeteorEmoji();
   const textareaSelector = 'textarea';
   const mentions = [
     // User mentions
@@ -100,9 +99,7 @@ Template.editor.onRendered(() => {
     if (inputs.length === 0) {
       // only enable richereditor to new comment or edit comment no others
       enableTextarea();
-    }
-    /*
-      else {
+    } else {
       const placeholder = inputs.attr('placeholder') || '';
       const mSummernotes = [];
       const getSummernote = function(input) {
@@ -261,7 +258,6 @@ Template.editor.onRendered(() => {
         });
       });
     }
-    */
   } else {
     enableTextarea();
   }