diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2016-01-21 07:08:17 -0500 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2016-01-21 07:08:17 -0500 |
| commit | 202e00d8dffc806a9a5686d784c2bbfd76494649 (patch) | |
| tree | adb64d9ac24c3deb735c3f3a14a87775bf4cb36b | |
| parent | 9163cd254895f04a3bd7cc8ffdf10cfa6b7c7714 (diff) | |
| parent | b48e36275d6fad4c2f11f567d6a4c327d53e314f (diff) | |
| download | chat-202e00d8dffc806a9a5686d784c2bbfd76494649.tar.gz chat-202e00d8dffc806a9a5686d784c2bbfd76494649.tar.bz2 chat-202e00d8dffc806a9a5686d784c2bbfd76494649.zip | |
Merge pull request #1885 from rgarmsen2295/plt-406
PLT-406 Fixes issues with drag and drop overlay in IE11
| -rw-r--r-- | web/react/utils/utils.jsx | 4 | ||||
| -rw-r--r-- | web/sass-files/sass/partials/_post.scss | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx index 24042321f..db469952b 100644 --- a/web/react/utils/utils.jsx +++ b/web/react/utils/utils.jsx @@ -1309,6 +1309,10 @@ export function fillArray(value, length) { // Checks if a data transfer contains files not text, folders, etc.. // Slightly modified from http://stackoverflow.com/questions/6848043/how-do-i-detect-a-file-is-being-dragged-rather-than-a-draggable-element-on-my-pa export function isFileTransfer(files) { + if (isBrowserIE()) { + return files.types != null && files.types.contains('Files'); + } + return files.types != null && (files.types.indexOf ? files.types.indexOf('Files') !== -1 : files.types.contains('application/x-moz-file')); } diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss index 7b7c2d73a..c5cd10b20 100644 --- a/web/sass-files/sass/partials/_post.scss +++ b/web/sass-files/sass/partials/_post.scss @@ -183,6 +183,7 @@ body.ios { position: absolute; top: 50%; left: 50%; + pointer-events: none; } .overlay__files { |