Fix media description in various media modals (#8678)

master
ThibG 6 years ago committed by Eugen Rochko
parent f8160b68b3
commit 4959ead07c
  1. 2
      app/javascript/mastodon/features/ui/components/media_modal.js
  2. 2
      app/javascript/mastodon/features/ui/components/video_modal.js
  3. 1
      app/javascript/mastodon/features/ui/components/zoomable_image.js
  4. 3
      app/javascript/mastodon/features/video/index.js

@ -149,7 +149,7 @@ export default class MediaModal extends ImmutablePureComponent {
startTime={time || 0} startTime={time || 0}
onCloseVideo={onClose} onCloseVideo={onClose}
detailed detailed
description={image.get('description')} alt={image.get('description')}
key={image.get('url')} key={image.get('url')}
/> />
); );

@ -24,7 +24,7 @@ export default class VideoModal extends ImmutablePureComponent {
startTime={time} startTime={time}
onCloseVideo={onClose} onCloseVideo={onClose}
detailed detailed
description={media.get('description')} alt={media.get('description')}
/> />
</div> </div>
</div> </div>

@ -137,6 +137,7 @@ export default class ZoomableImage extends React.PureComponent {
role='presentation' role='presentation'
ref={this.setImageRef} ref={this.setImageRef}
alt={alt} alt={alt}
title={alt}
src={src} src={src}
style={{ style={{
transform: `scale(${scale})`, transform: `scale(${scale})`,

@ -252,11 +252,12 @@ export default class Video extends React.PureComponent {
} }
handleOpenVideo = () => { handleOpenVideo = () => {
const { src, preview, width, height } = this.props; const { src, preview, width, height, alt } = this.props;
const media = fromJS({ const media = fromJS({
type: 'video', type: 'video',
url: src, url: src,
preview_url: preview, preview_url: preview,
description: alt,
width, width,
height, height,
}); });

Loading…
Cancel
Save