summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
authorSam X. Chen <sam.xi.chen@gmail.com>2019-08-10 00:48:05 -0400
committerSam X. Chen <sam.xi.chen@gmail.com>2019-08-10 00:48:05 -0400
commitc569565ec09b1d4d45d1870701995221ec785aea (patch)
treebf261e6e257efad3370f14b366e38c89d18e3496 /client
parent13a13e8eca67eea4bc8a44dad8a0de52035154ba (diff)
downloadwekan-c569565ec09b1d4d45d1870701995221ec785aea.tar.gz
wekan-c569565ec09b1d4d45d1870701995221ec785aea.tar.bz2
wekan-c569565ec09b1d4d45d1870701995221ec785aea.zip
Bugfix: 2560, 2604 - enable mixed mode mongodb attachment and filesystem attachment while reading
Diffstat (limited to 'client')
-rwxr-xr-xclient/components/main/editor.js4
1 files changed, 1 insertions, 3 deletions
diff --git a/client/components/main/editor.js b/client/components/main/editor.js
index 735aac1e..e217e113 100755
--- a/client/components/main/editor.js
+++ b/client/components/main/editor.js
@@ -1,6 +1,4 @@
import _sanitizeXss from 'xss';
-const enableRicherEditor =
- Meteor.settings.public.RICHER_CARD_COMMENT_EDITOR || true;
const sanitizeXss = (input, options) => {
const defaultAllowedIframeSrc = /^(https:){0,1}\/\/.*?(youtube|vimeo|dailymotion|youku)/i;
const allowedIframeSrcRegex = (function() {
@@ -104,7 +102,7 @@ Template.editor.onRendered(() => {
autosize($textarea);
$textarea.escapeableTextComplete(mentions);
};
- if (enableRicherEditor) {
+ if (Meteor.settings.public.RICHER_CARD_COMMENT_EDITOR !== false) {
const isSmall = Utils.isMiniScreen();
const toolbar = isSmall
? [