summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2020-03-06 03:52:12 +0200
committerLauri Ojansivu <x@xet7.org>2020-03-06 03:52:12 +0200
commit2b26bbe78a1a2b8b427963a6c44c3853efdb737e (patch)
tree90a71801d84a4c0a019e072a953299bbc0a2962d /client
parenta6d702d1ab9906898dab4cacec735043e5618fb1 (diff)
downloadwekan-2b26bbe78a1a2b8b427963a6c44c3853efdb737e.tar.gz
wekan-2b26bbe78a1a2b8b427963a6c44c3853efdb737e.tar.bz2
wekan-2b26bbe78a1a2b8b427963a6c44c3853efdb737e.zip
Fix: img tag did not allow width and height.
Removed swipebox from markdown editor img tag and updated marked markdown to newest version. Thanks to hradec and xet7 ! Closes #2956
Diffstat (limited to 'client')
-rwxr-xr-xclient/components/main/editor.js4
1 files changed, 4 insertions, 0 deletions
diff --git a/client/components/main/editor.js b/client/components/main/editor.js
index 39c03aa9..272be197 100755
--- a/client/components/main/editor.js
+++ b/client/components/main/editor.js
@@ -57,6 +57,9 @@ const sanitizeXss = (input, options) => {
}
}
}
+ /* Don't use swipebox on markdown, so that img tag can now use width
+ * and height parameters. https://github.com/wekan/wekan/issues/2956
+ * Previously this was added at https://github.com/wekan/wekan/pull/2593
} else if (tag === 'img') {
if (!options.isClosing) {
const src = getAttr('src');
@@ -64,6 +67,7 @@ const sanitizeXss = (input, options) => {
return `<a href='${src}' class='swipebox'><img src='${src}' class="attachment-image-preview mCS_img_loaded"></a>`;
}
}
+ */
}
return undefined;
},