summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCorey Hulen <corey@hulen.com>2016-01-21 09:02:58 -0600
committerCorey Hulen <corey@hulen.com>2016-01-21 09:02:58 -0600
commit302f210d66fd0850852aa2e636df14509688ee18 (patch)
tree76dd79bc26a81a56432fd6ccd283c65661896154
parent060e38ef86db7c4fd9247161ca0cbd379960d375 (diff)
parentcbfaff44cb6601ceda502486ed0b1e20a0ecb29f (diff)
downloadchat-302f210d66fd0850852aa2e636df14509688ee18.tar.gz
chat-302f210d66fd0850852aa2e636df14509688ee18.tar.bz2
chat-302f210d66fd0850852aa2e636df14509688ee18.zip
Merge pull request #1937 from hmhealey/plt1695
PLT-1695 Completely disabled broken pasting of images on IE11
-rw-r--r--web/react/components/file_upload.jsx6
1 files changed, 5 insertions, 1 deletions
diff --git a/web/react/components/file_upload.jsx b/web/react/components/file_upload.jsx
index fef253c52..7e6cc2942 100644
--- a/web/react/components/file_upload.jsx
+++ b/web/react/components/file_upload.jsx
@@ -151,7 +151,11 @@ export default class FileUpload extends React.Component {
});
}
- document.addEventListener('paste', function handlePaste(e) {
+ document.addEventListener('paste', (e) => {
+ if (!e.clipboardData) {
+ return;
+ }
+
var textarea = $(inputDiv.parentNode.parentNode).find('.custom-textarea')[0];
if (textarea !== e.target && !$.contains(textarea, e.target)) {