diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-07-29 08:32:48 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-07-29 08:32:48 -0400 |
| commit | a9e9d10e41e6c3d1609095a6a370a4632d22e19c (patch) | |
| tree | 310b919bf0044fc0f6c59abf5b0f7509e257cfa1 /web/react/components/post_body.jsx | |
| parent | 35fe9655c3164eead46b18db9e40c8b677cca636 (diff) | |
| parent | 91fa6c8da1cbf6647791fa43699eb310f990e7e9 (diff) | |
| download | chat-a9e9d10e41e6c3d1609095a6a370a4632d22e19c.tar.gz chat-a9e9d10e41e6c3d1609095a6a370a4632d22e19c.tar.bz2 chat-a9e9d10e41e6c3d1609095a6a370a4632d22e19c.zip | |
Merge pull request #252 from rgarmsen2295/ie10-image-regression-fix
Fixes issue with images not displaying in IE10 due to window.location.origin not being defined in IE10
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) { |