Browse Source

Add missing video descriptions (#8416)

* Pass through video description as necessary.

* Add title to video, matching aria-label.
master
M Somerville 6 years ago
committed by Eugen Rochko
parent
commit
ac092d03e7
9 changed files with 9 additions and 3 deletions
  1. +1
    -0
      app/javascript/mastodon/components/extended_video_player.js
  2. +1
    -0
      app/javascript/mastodon/components/media_gallery.js
  3. +1
    -0
      app/javascript/mastodon/components/status.js
  4. +1
    -0
      app/javascript/mastodon/features/report/components/status_check_box.js
  5. +1
    -0
      app/javascript/mastodon/features/status/components/detailed_status.js
  6. +1
    -0
      app/javascript/mastodon/features/video/index.js
  7. +1
    -1
      app/views/admin/reports/_status.html.haml
  8. +1
    -1
      app/views/stream_entries/_detailed_status.html.haml
  9. +1
    -1
      app/views/stream_entries/_simple_status.html.haml

+ 1
- 0
app/javascript/mastodon/components/extended_video_player.js View File

@ -50,6 +50,7 @@ export default class ExtendedVideoPlayer extends React.PureComponent {
role='button'
tabIndex='0'
aria-label={alt}
title={alt}
muted={muted}
controls={controls}
loop={!controls}

+ 1
- 0
app/javascript/mastodon/components/media_gallery.js View File

@ -154,6 +154,7 @@ class Item extends React.PureComponent {
<video
className='media-gallery__item-gifv-thumbnail'
aria-label={attachment.get('description')}
title={attachment.get('description')}
role='application'
src={attachment.get('url')}
onClick={this.handleClick}

+ 1
- 0
app/javascript/mastodon/components/status.js View File

@ -230,6 +230,7 @@ export default class Status extends ImmutablePureComponent {
<Component
preview={video.get('preview_url')}
src={video.get('url')}
alt={video.get('description')}
width={239}
height={110}
inline

+ 1
- 0
app/javascript/mastodon/features/report/components/status_check_box.js View File

@ -36,6 +36,7 @@ export default class StatusCheckBox extends React.PureComponent {
<Component
preview={video.get('preview_url')}
src={video.get('url')}
alt={video.get('description')}
width={239}
height={110}
inline

+ 1
- 0
app/javascript/mastodon/features/status/components/detailed_status.js View File

@ -60,6 +60,7 @@ export default class DetailedStatus extends ImmutablePureComponent {
<Video
preview={video.get('preview_url')}
src={video.get('url')}
alt={video.get('description')}
width={300}
height={150}
inline

+ 1
- 0
app/javascript/mastodon/features/video/index.js View File

@ -315,6 +315,7 @@ export default class Video extends React.PureComponent {
role='button'
tabIndex='0'
aria-label={alt}
title={alt}
width={width}
height={height}
onClick={this.togglePlay}

+ 1
- 1
app/views/admin/reports/_status.html.haml View File

@ -14,7 +14,7 @@
- unless status.proper.media_attachments.empty?
- if status.proper.media_attachments.first.video?
- video = status.proper.media_attachments.first
= react_component :video, src: video.file.url(:original), preview: video.file.url(:small), sensitive: status.proper.sensitive? && !current_account&.user&.setting_display_sensitive_media, width: 610, height: 343, inline: true
= react_component :video, src: video.file.url(:original), preview: video.file.url(:small), sensitive: status.proper.sensitive? && !current_account&.user&.setting_display_sensitive_media, width: 610, height: 343, inline: true, alt: video.description
- else
= react_component :media_gallery, height: 343, sensitive: status.proper.sensitive? && !current_account&.user&.setting_display_sensitive_media, 'autoPlayGif': current_account&.user&.setting_auto_play_gif, media: status.proper.media_attachments.map { |a| ActiveModelSerializers::SerializableResource.new(a, serializer: REST::MediaAttachmentSerializer).as_json }

+ 1
- 1
app/views/stream_entries/_detailed_status.html.haml View File

@ -21,7 +21,7 @@
- if !status.media_attachments.empty?
- if status.media_attachments.first.video?
- video = status.media_attachments.first
= react_component :video, src: video.file.url(:original), preview: video.file.url(:small), sensitive: status.sensitive? && !current_account&.user&.setting_display_sensitive_media, width: 670, height: 380, detailed: true, inline: true
= react_component :video, src: video.file.url(:original), preview: video.file.url(:small), sensitive: status.sensitive? && !current_account&.user&.setting_display_sensitive_media, width: 670, height: 380, detailed: true, inline: true, alt: video.description
- else
= react_component :media_gallery, height: 380, sensitive: status.sensitive? && !current_account&.user&.setting_display_sensitive_media, standalone: true, 'autoPlayGif': current_account&.user&.setting_auto_play_gif, 'reduceMotion': current_account&.user&.setting_reduce_motion, media: status.media_attachments.map { |a| ActiveModelSerializers::SerializableResource.new(a, serializer: REST::MediaAttachmentSerializer).as_json }
- elsif status.preview_cards.first

+ 1
- 1
app/views/stream_entries/_simple_status.html.haml View File

@ -24,7 +24,7 @@
- unless status.media_attachments.empty?
- if status.media_attachments.first.video?
- video = status.media_attachments.first
= react_component :video, src: video.file.url(:original), preview: video.file.url(:small), sensitive: status.sensitive? && !current_account&.user&.setting_display_sensitive_media, width: 610, height: 343, inline: true
= react_component :video, src: video.file.url(:original), preview: video.file.url(:small), sensitive: status.sensitive? && !current_account&.user&.setting_display_sensitive_media, width: 610, height: 343, inline: true, alt: video.description
- else
= react_component :media_gallery, height: 343, sensitive: status.sensitive? && !current_account&.user&.setting_display_sensitive_media, 'autoPlayGif': current_account&.user&.setting_auto_play_gif, media: status.media_attachments.map { |a| ActiveModelSerializers::SerializableResource.new(a, serializer: REST::MediaAttachmentSerializer).as_json }

Loading…
Cancel
Save