diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-07-30 01:06:50 -0800 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-07-30 01:06:50 -0800 |
| commit | d93bf60248f066542d0851a7b6847f925975d77f (patch) | |
| tree | bb2c8a931855c3a9da6cdd7d906a8f1b99b7fd46 /web/react/components/file_preview.jsx | |
| parent | b4877c5d36569dae486a1e53f39c35d346e3d3d2 (diff) | |
| parent | deb4fac1f64fde5d5f435129a79eada44cb6994c (diff) | |
| download | chat-d93bf60248f066542d0851a7b6847f925975d77f.tar.gz chat-d93bf60248f066542d0851a7b6847f925975d77f.tar.bz2 chat-d93bf60248f066542d0851a7b6847f925975d77f.zip | |
Merge branch 'master' into mm-1355
Diffstat (limited to 'web/react/components/file_preview.jsx')
| -rw-r--r-- | web/react/components/file_preview.jsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/web/react/components/file_preview.jsx b/web/react/components/file_preview.jsx index fdd12feec..7c1db3e10 100644 --- a/web/react/components/file_preview.jsx +++ b/web/react/components/file_preview.jsx @@ -24,7 +24,7 @@ module.exports = React.createClass({ if (filename.indexOf("/api/v1/files/get") != -1) { filename = filename.split("/api/v1/files/get")[1]; } - filename = window.location.origin + "/api/v1/files/get" + filename; + filename = utils.getWindowLocationOrigin() + "/api/v1/files/get" + filename; if (type === "image") { previews.push( |