github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-24 03:36:18 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Skip HTML pasting if image upload available

Browse Source
This commit is contained in:
Vinoth Kannan
2017-12-15 16:40:40 +05:30
parent 91e84433ff
commit 236ecec0b0
3 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/assets/javascripts/discourse/lib/utilities.js.es6
View File

@ -421,18 +421,27 @@ export function isAppleDevice() {
!navigator.userAgent.match(/Trident/g);
}
export function clipboardData(e) {
export function clipboardData(e, canUpload) {
const clipboard = e.clipboardData ||
e.originalEvent.clipboardData ||
e.delegatedEvent.originalEvent.clipboardData;
let types = clipboard.types;
let files = clipboard.files;
if (!Array.isArray(types)) {
types = Array.from(types);
}
return { clipboard: clipboard, types: types };
if (!Array.isArray(files)) {
files = Array.from(files);
}
canUpload = files && canUpload && !types.includes("text/plain");
const canUploadImage = canUpload && files.filter(f => f.type.match('^image/'))[0];
const canPasteHtml = Discourse.SiteSettings.enable_rich_text_paste && types.includes("text/html") && !canUploadImage;
return { clipboard: clipboard, types: types, canUpload: canUpload, canPasteHtml: canPasteHtml };
}
// This prevents a mini racer crash