diff options
author | ThibG <thib@sitedethib.com> | 2020-11-04 14:52:19 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-04 14:52:19 +0100 |
commit | 1f69ad798d9a42d8ec3df69ded7625524c5eb67c (patch) | |
tree | a8e0759e3f13bf13dabbb8a261cd1bdb2f3e1e1a /app/javascript/flavours/glitch/features/ui/components/image_loader.js | |
parent | b8e790c3c22693271a4fd74ce34067c462ebf8a3 (diff) | |
parent | dc86d814d93b9bb564ab35728c6d9fb65d064ca3 (diff) |
Merge pull request #1450 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/features/ui/components/image_loader.js')
-rw-r--r-- | app/javascript/flavours/glitch/features/ui/components/image_loader.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/javascript/flavours/glitch/features/ui/components/image_loader.js b/app/javascript/flavours/glitch/features/ui/components/image_loader.js index 5e1cf75af..c6f16a792 100644 --- a/app/javascript/flavours/glitch/features/ui/components/image_loader.js +++ b/app/javascript/flavours/glitch/features/ui/components/image_loader.js @@ -13,6 +13,7 @@ export default class ImageLoader extends React.PureComponent { width: PropTypes.number, height: PropTypes.number, onClick: PropTypes.func, + zoomButtonHidden: PropTypes.bool, } static defaultProps = { @@ -151,6 +152,9 @@ export default class ImageLoader extends React.PureComponent { alt={alt} src={src} onClick={onClick} + width={width} + height={height} + zoomButtonHidden={this.props.zoomButtonHidden} /> )} </div> |