Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-12-22 02:10:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Bugfix: 2560, 2604 - enable mixed mode mongodb attachment and filesystem attachment while reading

Browse source
This commit is contained in:
Sam X. Chen 2019-08-10 00:48:05 -04:00
parent 13a13e8eca
commit c569565ec0
6 changed files with 180 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

4
client/components/main/editor.js
View file

@ -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
? [