From 6f091f0f6d17b74a5d87517ef35f89cd46e1bcb4 Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Tue, 11 Aug 2015 15:31:07 -0700
Subject: Added check to make sure files are not strings

---
 web/react/components/file_upload.jsx | 8 ++++++--
 web/react/components/post_list.jsx   | 6 +-----
 web/react/components/post_right.jsx  | 7 +------
 3 files changed, 8 insertions(+), 13 deletions(-)

(limited to 'web/react/components')

diff --git a/web/react/components/file_upload.jsx b/web/react/components/file_upload.jsx
index f382b848a..05c883ffc 100644
--- a/web/react/components/file_upload.jsx
+++ b/web/react/components/file_upload.jsx
@@ -84,13 +84,17 @@ module.exports = React.createClass({
         this.props.onUploadError(null);
 
         var files = e.originalEvent.dataTransfer.files;
-        if (files.length) {
+        if (!files.length) {
+            files = e.originalEvent.dataTransfer.getData('URL');
+        }
+        var channelId = this.props.channelId || ChannelStore.getCurrentId();
+
+        if (typeof files !== 'string' && files.length) {
             var numFiles = files.length;
             var numToUpload = this.props.setUploads(numFiles);
 
             for (var i = 0; i < numFiles && i < numToUpload; i++) {
                 var file = files[i];
-                var channelId = this.props.channelId || ChannelStore.getCurrentId();
 
                 var formData = new FormData();
                 formData.append('channel_id', channelId);
diff --git a/web/react/components/post_list.jsx b/web/react/components/post_list.jsx
index 826d34a7d..83f806b79 100644
--- a/web/react/components/post_list.jsx
+++ b/web/react/components/post_list.jsx
@@ -124,6 +124,7 @@ module.exports = React.createClass({
                 $(this).parent('div').next('.date-separator, .new-separator').removeClass('hovered--comment');
             }
         });
+
     },
     componentDidUpdate: function() {
         this.resize();
@@ -461,11 +462,6 @@ module.exports = React.createClass({
             postCtls.push(<LoadingScreen position="absolute" />);
         }
 
-        var fileDragOverlay = '';
-        if (this.state.fileDrag) {
-            fileDragOverlay = 'post-list-file-overlay';
-        }
-
         return (
             <div ref="postlist" className="post-list-holder-by-time">
                 <div className="post-list__table">
diff --git a/web/react/components/post_right.jsx b/web/react/components/post_right.jsx
index ad993aee1..ad8b54012 100644
--- a/web/react/components/post_right.jsx
+++ b/web/react/components/post_right.jsx
@@ -294,13 +294,8 @@ module.exports = React.createClass({
         var currentId = UserStore.getCurrentId();
         var searchForm = currentId == null ? null : <SearchBox />;
 
-        var fileDragOverlay = '';
-        if (this.state.fileDrag) {
-            fileDragOverlay = 'post-right-file-overlay';
-        }
-
         return (
-            <div className="post-right__container ">
+            <div className="post-right__container">
                 <div className="search-bar__container sidebar--right__search-header">{searchForm}</div>
                 <div className="sidebar-right__body">
                     <RhsHeaderPost fromSearch={this.props.fromSearch} isMentionSearch={this.props.isMentionSearch} />
-- 
cgit v1.2.3-1-g7c22