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/post_body.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/post_body.jsx')
| -rw-r--r-- | web/react/components/post_body.jsx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/web/react/components/post_body.jsx b/web/react/components/post_body.jsx index 9f598ecb3..641ffeef2 100644 --- a/web/react/components/post_body.jsx +++ b/web/react/components/post_body.jsx @@ -32,7 +32,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; if (type === "image") { $('<img/>').attr('src', fileInfo.path+'_thumb.jpg').load(function(path, name){ return function() { @@ -112,7 +112,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; if (type === "image") { if (i < Constants.MAX_DISPLAY_FILES) { |