Merge pull request #274 from mattermost/mm-1497

MM-1497 image thumbnails now scale appropriately so there is no whitespace

1 files changed, 11 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');