Merge pull request #230 from mattermost/download-link-fix

fixed download link in image viewer

1 files changed, 10 insertions, 3 deletions

diff --git a/web/react/components/view_image.jsx b/web/react/components/view_image.jsx
index ac0ecf299..c107de4d7 100644
--- a/web/react/components/view_image.jsx
+++ b/web/react/components/view_image.jsx
@@ -37,7 +37,7 @@ module.exports = React.createClass({
         } else {
             var fileInfo = utils.splitFileLocation(this.props.filenames[id]);
             // This is a temporary patch to fix issue with old files using absolute paths
-            if (fileInfo.path.indexOf("/api/v1/files/get") != -1) {
+            if (fileInfo.path.indexOf("/api/v1/files/get") !== -1) {
                 fileInfo.path = fileInfo.path.split("/api/v1/files/get")[1];
             }
             fileInfo.path = window.location.origin + "/api/v1/files/get" + fileInfo.path;
@@ -145,7 +145,7 @@ module.exports = React.createClass({
                     preview_filename = this.props.filenames[this.state.imgId];
                 } else {
                     // This is a temporary patch to fix issue with old files using absolute paths
-                    if (info.path.indexOf("/api/v1/files/get") != -1) {
+                    if (info.path.indexOf("/api/v1/files/get") !== -1) {
                         info.path = info.path.split("/api/v1/files/get")[1];
                     }
                     info.path = window.location.origin + "/api/v1/files/get" + info.path;
@@ -161,6 +161,13 @@ module.exports = React.createClass({
 
         var imgFragment = React.addons.createFragment(img);
 
+        // This is a temporary patch to fix issue with old files using absolute paths
+        var download_link = this.props.filenames[this.state.imgId];
+        if (download_link.indexOf("/api/v1/files/get") !== -1) {
+            download_link = download_link.split("/api/v1/files/get")[1];
+        }
+        download_link = window.location.origin + "/api/v1/files/get" + download_link;
+
         return (
             <div className="modal fade image_modal" ref="modal" id={this.props.modalId} tabIndex="-1" role="dialog" aria-hidden="true">
                 <div className="modal-dialog modal-image">
@@ -178,7 +185,7 @@ module.exports = React.createClass({
                                                 <span className="text"> | </span>
                                             </div>
                                         : "" }
-                                        <a href={this.props.filenames[id]} download={decodeURIComponent(name)} className="text">Download</a>
+                                        <a href={download_link} download={decodeURIComponent(name)} className="text">Download</a>
                                     </div>
                                 </div>
                                 {loading}