diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-08-27 11:05:18 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-08-27 11:05:18 -0700 |
| commit | 30f22ec9c757d41038a8fcaa4c3ea963301d2574 (patch) | |
| tree | 138d93550fae35285653f80bd11686f2750445dd | |
| parent | db7e8c12889485234fb2d1ba6556106e5fc7548b (diff) | |
| download | chat-30f22ec9c757d41038a8fcaa4c3ea963301d2574.tar.gz chat-30f22ec9c757d41038a8fcaa4c3ea963301d2574.tar.bz2 chat-30f22ec9c757d41038a8fcaa4c3ea963301d2574.zip | |
MM-2033 fixes img showing infinity progress
| -rw-r--r-- | api/file.go | 1 | ||||
| -rw-r--r-- | web/react/components/view_image.jsx | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/api/file.go b/api/file.go index 50482a057..800c512c5 100644 --- a/api/file.go +++ b/api/file.go @@ -347,6 +347,7 @@ func getFile(c *Context, w http.ResponseWriter, r *http.Request) { } w.Header().Set("Cache-Control", "max-age=2592000, public") + w.Header().Set("Content-Length", strconv.Itoa(len(f))) w.Write(f) } diff --git a/web/react/components/view_image.jsx b/web/react/components/view_image.jsx index 24efce0f1..c65cd9bb5 100644 --- a/web/react/components/view_image.jsx +++ b/web/react/components/view_image.jsx @@ -248,6 +248,7 @@ module.exports = React.createClass({ // display a progress indicator when the preview for an image is still loading var percentage = Math.floor(this.state.progress[this.state.imgId]); if (percentage) { + content = ( <div> <img className='loader-image' src='/static/images/load.gif' /> |