diff options
author | Corey Hulen <corey@hulen.com> | 2015-08-25 13:17:21 -0700 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2015-08-25 13:17:21 -0700 |
commit | eb5af31c17f1f8ff1dabdbfeaf4d7ae24700d6ac (patch) | |
tree | 8407caf850b9246b30d7ce2ca6726e66244b7ce2 /web/react/components/view_image.jsx | |
parent | b4ee26373042d2c5ab422a4955022fb278cb8fa1 (diff) | |
parent | 64b179ab0e6a66c0f8edb72ab24ef28bbc2f9969 (diff) | |
download | chat-eb5af31c17f1f8ff1dabdbfeaf4d7ae24700d6ac.tar.gz chat-eb5af31c17f1f8ff1dabdbfeaf4d7ae24700d6ac.tar.bz2 chat-eb5af31c17f1f8ff1dabdbfeaf4d7ae24700d6ac.zip |
Merge pull request #466 from mattermost/mm-1912
Fixes mm-1912 move get file info into its own web service call
Diffstat (limited to 'web/react/components/view_image.jsx')
-rw-r--r-- | web/react/components/view_image.jsx | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/web/react/components/view_image.jsx b/web/react/components/view_image.jsx index 6077c4ebc..fefd8d57d 100644 --- a/web/react/components/view_image.jsx +++ b/web/react/components/view_image.jsx @@ -229,13 +229,18 @@ module.exports = React.createClass({ if (!(filename in this.state.fileSizes)) { var self = this; - utils.getFileSize(utils.getFileUrl(filename), function fileSizeOp(fileSize) { - if (self.canSetState) { - var fileSizes = self.state.fileSizes; - fileSizes[filename] = fileSize; - self.setState(fileSizes); + Client.getFileInfo( + filename, + function(data) { + if (self.canSetState) { + var fileSizes = self.state.fileSizes; + fileSizes[filename] = parseInt(data["size"], 10); + self.setState(fileSizes); + } + }, + function(err) { } - }); + ); } } } else { |