diff options
| author | Stas Vovk <stas@vovk.me> | 2015-10-12 21:54:51 +0300 |
|---|---|---|
| committer | Stas Vovk <stas@vovk.me> | 2015-10-12 21:54:51 +0300 |
| commit | bafb341015e6a9aaba878bec8126fcc825531015 (patch) | |
| tree | 1312efa11b3435205d2d31818a0f2ce91269373c /web/react/components/view_image.jsx | |
| parent | b5a499977ec212139444974255a27f8e66d0befd (diff) | |
| parent | 246d934e5e557555645a1d26ae005be452ecbd2d (diff) | |
| download | chat-bafb341015e6a9aaba878bec8126fcc825531015.tar.gz chat-bafb341015e6a9aaba878bec8126fcc825531015.tar.bz2 chat-bafb341015e6a9aaba878bec8126fcc825531015.zip | |
Merge remote-tracking branch 'upstream/master' into PLT-589
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()} |