diff options
author | Asaad Mahmood <Unknowngi@live.com> | 2015-07-29 19:29:41 +0500 |
---|---|---|
committer | Asaad Mahmood <Unknowngi@live.com> | 2015-07-29 19:29:41 +0500 |
commit | 5f2aa88a083f92d263e8f2a57253595071c4b904 (patch) | |
tree | cff481ab565b20289169c0effa49f657063f7af8 /web/react/components/view_image.jsx | |
parent | ac8706b9f742ce2935e6e9785ecd7ae7358fef0f (diff) | |
parent | 54265271fa16c624570ff89a26ae8596cf0fafc7 (diff) | |
download | chat-5f2aa88a083f92d263e8f2a57253595071c4b904.tar.gz chat-5f2aa88a083f92d263e8f2a57253595071c4b904.tar.bz2 chat-5f2aa88a083f92d263e8f2a57253595071c4b904.zip |
Merge branch 'master' of https://github.com/mattermost/platform into mm-1762
Diffstat (limited to 'web/react/components/view_image.jsx')
-rw-r--r-- | web/react/components/view_image.jsx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/web/react/components/view_image.jsx b/web/react/components/view_image.jsx index c107de4d7..7b096c629 100644 --- a/web/react/components/view_image.jsx +++ b/web/react/components/view_image.jsx @@ -40,7 +40,7 @@ module.exports = React.createClass({ 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; + fileInfo.path = utils.getWindowLocationOrigin() + "/api/v1/files/get" + fileInfo.path; src = fileInfo['path'] + '_preview.jpg'; } @@ -148,7 +148,7 @@ module.exports = React.createClass({ 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; + info.path = utils.getWindowLocationOrigin() + "/api/v1/files/get" + info.path; preview_filename = info['path'] + '_preview.jpg'; } @@ -166,7 +166,7 @@ module.exports = React.createClass({ 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; + download_link = utils.getWindowLocationOrigin() + "/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"> |