diff options
| author | Asaad Mahmood <Unknowngi@live.com> | 2015-10-12 23:36:24 +0500 |
|---|---|---|
| committer | Asaad Mahmood <Unknowngi@live.com> | 2015-10-12 23:36:24 +0500 |
| commit | 893a72141bcab38c8a5a10ec920c9480120d6b51 (patch) | |
| tree | 58a63db7918abd24f3a5839da39568ac54b2c9c5 /web/react/components/view_image.jsx | |
| parent | 7bb8f5d1ef47e02c4f1784656f6abcff409b96d5 (diff) | |
| parent | 246d934e5e557555645a1d26ae005be452ecbd2d (diff) | |
| download | chat-893a72141bcab38c8a5a10ec920c9480120d6b51.tar.gz chat-893a72141bcab38c8a5a10ec920c9480120d6b51.tar.bz2 chat-893a72141bcab38c8a5a10ec920c9480120d6b51.zip | |
Merge branch 'master' of https://github.com/mattermost/platform into ui-fixes
Diffstat (limited to 'web/react/components/view_image.jsx')
| -rw-r--r-- | web/react/components/view_image.jsx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/web/react/components/view_image.jsx b/web/react/components/view_image.jsx index 8ef68dd0a..c5f0abc12 100644 --- a/web/react/components/view_image.jsx +++ b/web/react/components/view_image.jsx @@ -195,6 +195,7 @@ export default class ViewImageModal extends React.Component { target='_blank' > <img + style={{maxHeight: this.state.imgHeight}} ref='image' src={this.getPreviewImagePath(filename)} /> @@ -210,6 +211,7 @@ export default class ViewImageModal extends React.Component { content = ( <video + style={{maxHeight: this.state.imgHeight}} ref='video' data-setup='{}' controls='controls' @@ -334,7 +336,6 @@ export default class ViewImageModal extends React.Component { > <div className={'image-wrapper ' + bgClass} - style={{maxHeight: this.state.imgHeight}} onMouseEnter={this.onMouseEnterImage} onMouseLeave={this.onMouseLeaveImage} onClick={(e) => e.stopPropagation()} |