IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: prevents url of file from being pasted when pasting file on iOS (#8693)

Browse Source
This commit is contained in:
Joffrey JAFFEUX 2020-01-10 04:09:01 +01:00 committed by Vinoth Kannan
parent cb660ef952
commit 5ce602ecea
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/components/d-editor.js.es6
View File

@ -842,7 +842,7 @@ export default Component.extend({
} }
const isComposer = $("#reply-control .d-editor-input").is(":focus"); const isComposer = $("#reply-control .d-editor-input").is(":focus");
let { clipboard, canPasteHtml } = clipboardData(e, isComposer); let { clipboard, canPasteHtml, canUpload } = clipboardData(e, isComposer);
let plainText = clipboard.getData("text/plain"); let plainText = clipboard.getData("text/plain");
let html = clipboard.getData("text/html"); let html = clipboard.getData("text/html");
@ -892,7 +892,7 @@ export default Component.extend({
} }
} }
if (handled) { if (handled || canUpload) {
e.preventDefault(); e.preventDefault();
} }
}, },