diff options
author | Corey Hulen <corey@hulen.com> | 2015-08-02 08:58:33 -0800 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2015-08-02 08:58:33 -0800 |
commit | 41f96636d6a92f622518271f9ea7dd66c8c84e47 (patch) | |
tree | b9462b5385b505a0220a1df47e5efe64fd2d84d0 /web/react | |
parent | 810c527fcbf5a9b4e32fe94e3ea00e20bddc020a (diff) | |
parent | dad78514234029791ff02c9a0efd2cbacdac5280 (diff) | |
download | chat-41f96636d6a92f622518271f9ea7dd66c8c84e47.tar.gz chat-41f96636d6a92f622518271f9ea7dd66c8c84e47.tar.bz2 chat-41f96636d6a92f622518271f9ea7dd66c8c84e47.zip |
Merge pull request #274 from mattermost/mm-1497
MM-1497 image thumbnails now scale appropriately so there is no whitespace
Diffstat (limited to 'web/react')
-rw-r--r-- | web/react/components/file_attachment.jsx | 11 | ||||
-rw-r--r-- | web/react/utils/constants.jsx | 2 |
2 files changed, 13 insertions, 0 deletions
diff --git a/web/react/components/file_attachment.jsx b/web/react/components/file_attachment.jsx index 3cd791887..b7ea5734f 100644 --- a/web/react/components/file_attachment.jsx +++ b/web/react/components/file_attachment.jsx @@ -2,6 +2,7 @@ // See License.txt for license information. var utils = require('../utils/utils.jsx'); +var Constants = require('../utils/constants.jsx'); module.exports = React.createClass({ displayName: "FileAttachment", @@ -44,6 +45,16 @@ module.exports = React.createClass({ $(imgDiv).removeClass('post__load'); $(imgDiv).addClass('post__image'); + var width = this.width || $(this).width(); + var height = this.height || $(this).height(); + + if (width < Constants.THUMBNAIL_WIDTH + && height < Constants.THUMBNAIL_HEIGHT) { + $(imgDiv).addClass('small'); + } else { + $(imgDiv).addClass('normal'); + } + var re1 = new RegExp(' ', 'g'); var re2 = new RegExp('\\(', 'g'); var re3 = new RegExp('\\)', 'g'); diff --git a/web/react/utils/constants.jsx b/web/react/utils/constants.jsx index 77ce19530..3509c9514 100644 --- a/web/react/utils/constants.jsx +++ b/web/react/utils/constants.jsx @@ -52,6 +52,8 @@ module.exports = { MAX_DISPLAY_FILES: 5, MAX_UPLOAD_FILES: 5, MAX_FILE_SIZE: 50000000, // 50 MB + THUMBNAIL_WIDTH: 128, + THUMBNAIL_HEIGHT: 100, DEFAULT_CHANNEL: 'town-square', OFFTOPIC_CHANNEL: 'off-topic', POST_CHUNK_SIZE: 60, |