diff options
| author | Corey Hulen <corey@hulen.com> | 2016-01-07 21:21:06 -0600 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2016-01-07 21:21:06 -0600 |
| commit | 3327ae5cf69ba6988470337221ab2f7ea3ec76c8 (patch) | |
| tree | a1ff50230846cd8bc7b399b5d6b4b6c7ec1e4c26 /web/react/components/file_upload.jsx | |
| parent | 5bcb9f1c50ed9c319d2a21f2ecb4816c51d18b40 (diff) | |
| parent | 9d9eaec14f4e4a8bc3bda4ef19c980bef2bb467b (diff) | |
| download | chat-3327ae5cf69ba6988470337221ab2f7ea3ec76c8.tar.gz chat-3327ae5cf69ba6988470337221ab2f7ea3ec76c8.tar.bz2 chat-3327ae5cf69ba6988470337221ab2f7ea3ec76c8.zip | |
Merge pull request #1821 from rgarmsen2295/plt-846
PLT-846 Disable the ability to drag and drop text
Diffstat (limited to 'web/react/components/file_upload.jsx')
| -rw-r--r-- | web/react/components/file_upload.jsx | 34 |
1 files changed, 24 insertions, 10 deletions
diff --git a/web/react/components/file_upload.jsx b/web/react/components/file_upload.jsx index 9316ca9a5..8c7353e86 100644 --- a/web/react/components/file_upload.jsx +++ b/web/react/components/file_upload.jsx @@ -109,8 +109,6 @@ export default class FileUpload extends React.Component { if (typeof files !== 'string' && files.length) { this.uploadFiles(files); - } else { - this.props.onTextDrop(e.originalEvent.dataTransfer.getData('Text')); } } @@ -120,11 +118,19 @@ export default class FileUpload extends React.Component { if (this.props.postType === 'post') { $('.row.main').dragster({ - enter() { - $('.center-file-overlay').removeClass('hidden'); + enter(dragsterEvent, e) { + var files = e.originalEvent.dataTransfer; + + if (utils.isFileTransfer(files)) { + $('.center-file-overlay').removeClass('hidden'); + } }, - leave() { - $('.center-file-overlay').addClass('hidden'); + leave(dragsterEvent, e) { + var files = e.originalEvent.dataTransfer; + + if (utils.isFileTransfer(files)) { + $('.center-file-overlay').addClass('hidden'); + } }, drop(dragsterEvent, e) { $('.center-file-overlay').addClass('hidden'); @@ -133,11 +139,19 @@ export default class FileUpload extends React.Component { }); } else if (this.props.postType === 'comment') { $('.post-right__container').dragster({ - enter() { - $('.right-file-overlay').removeClass('hidden'); + enter(dragsterEvent, e) { + var files = e.originalEvent.dataTransfer; + + if (utils.isFileTransfer(files)) { + $('.right-file-overlay').removeClass('hidden'); + } }, - leave() { - $('.right-file-overlay').addClass('hidden'); + leave(dragsterEvent, e) { + var files = e.originalEvent.dataTransfer; + + if (utils.isFileTransfer(files)) { + $('.right-file-overlay').addClass('hidden'); + } }, drop(dragsterEvent, e) { $('.right-file-overlay').addClass('hidden'); |