Merge pull request #539 from rgarmsen2295/reformat_part_one

MM-2063 Cosmetic Refactoring

1 files changed, 77 insertions, 29 deletions

diff --git a/web/react/components/file_preview.jsx b/web/react/components/file_preview.jsx
index d1b2f734a..33382a439 100644
--- a/web/react/components/file_preview.jsx
+++ b/web/react/components/file_preview.jsx
@@ -1,14 +1,17 @@
 // Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var UserStore = require('../stores/user_store.jsx');
-var ChannelStore = require('../stores/channel_store.jsx');
-var client = require('../utils/client.jsx');
-var utils = require('../utils/utils.jsx');
-var Constants = require('../utils/constants.jsx');
+var Utils = require('../utils/utils.jsx');
 
-module.exports = React.createClass({
-    handleRemove: function(e) {
+export default class FilePreview extends React.Component {
+    constructor(props) {
+        super(props);
+
+        this.handleRemove = this.handleRemove.bind(this);
+
+        this.state = {};
+    }
+    handleRemove(e) {
         var previewDiv = e.target.parentNode.parentNode;
 
         if (previewDiv.hasAttribute('data-filename')) {
@@ -16,51 +19,96 @@ module.exports = React.createClass({
         } else if (previewDiv.hasAttribute('data-client-id')) {
             this.props.onRemove(previewDiv.getAttribute('data-client-id'));
         }
-    },
-    render: function() {
+    }
+    render() {
         var previews = [];
-        this.props.files.forEach(function(filename) {
-
+        this.props.files.forEach(function setupPreview(fullFilename) {
+            var filename = fullFilename;
             var originalFilename = filename;
             var filenameSplit = filename.split('.');
-            var ext = filenameSplit[filenameSplit.length-1];
-            var type = utils.getFileType(ext);
+            var ext = filenameSplit[filenameSplit.length - 1];
+            var type = Utils.getFileType(ext);
+
             // This is a temporary patch to fix issue with old files using absolute paths
-            if (filename.indexOf("/api/v1/files/get") != -1) {
-                filename = filename.split("/api/v1/files/get")[1];
+
+            if (filename.indexOf('/api/v1/files/get') !== -1) {
+                filename = filename.split('/api/v1/files/get')[1];
             }
-            filename = utils.getWindowLocationOrigin() + "/api/v1/files/get" + filename;
+            filename = Utils.getWindowLocationOrigin() + '/api/v1/files/get' + filename;
 
-            if (type === "image") {
+            if (type === 'image') {
                 previews.push(
-                    <div key={filename} className="preview-div" data-filename={originalFilename}>
-                        <img className="preview-img" src={filename}/>
-                        <a className="remove-preview" onClick={this.handleRemove}><i className="glyphicon glyphicon-remove"/></a>
+                    <div
+                        key={filename}
+                        className='preview-div'
+                        data-filename={originalFilename}
+                    >
+                        <img
+                            className='preview-img'
+                            src={filename}
+                        />
+                        <a
+                            className='remove-preview'
+                            onClick={this.handleRemove}
+                        >
+                            <i className='glyphicon glyphicon-remove'/>
+                        </a>
                     </div>
                 );
             } else {
                 previews.push(
-                    <div key={filename} className="preview-div custom-file" data-filename={originalFilename}>
-                        <div className={"file-icon "+utils.getIconClassName(type)}/>
-                        <a className="remove-preview" onClick={this.handleRemove}><i className="glyphicon glyphicon-remove"/></a>
+                    <div
+                        key={filename}
+                        className='preview-div custom-file'
+                        data-filename={originalFilename}
+                    >
+                        <div className={'file-icon ' + Utils.getIconClassName(type)}/>
+                        <a
+                            className='remove-preview'
+                            onClick={this.handleRemove}
+                        >
+                            <i className='glyphicon glyphicon-remove'/>
+                        </a>
                     </div>
                 );
             }
         }.bind(this));
 
-        this.props.uploadsInProgress.forEach(function(clientId) {
+        this.props.uploadsInProgress.forEach(function addUploadsInProgress(clientId) {
             previews.push(
-                <div className="preview-div" data-client-id={clientId}>
-                    <img className="spinner" src="/static/images/load.gif"/>
-                    <a className="remove-preview" onClick={this.handleRemove}><i className="glyphicon glyphicon-remove"/></a>
+                <div
+                    key={clientId}
+                    className='preview-div'
+                    data-client-id={clientId}
+                >
+                    <img
+                        className='spinner'
+                        src='/static/images/load.gif'
+                    />
+                    <a
+                        className='remove-preview'
+                        onClick={this.handleRemove}
+                    >
+                        <i className='glyphicon glyphicon-remove'/>
+                    </a>
                 </div>
             );
         }.bind(this));
 
         return (
-            <div className="preview-container">
+            <div className='preview-container'>
                 {previews}
             </div>
         );
     }
-});
+}
+
+FilePreview.defaultProps = {
+    files: null,
+    uploadsInProgress: null
+};
+FilePreview.propTypes = {
+    onRemove: React.PropTypes.func.isRequired,
+    files: React.PropTypes.array,
+    uploadsInProgress: React.PropTypes.array
+};