Skip to content
Snippets Groups Projects

[Sprint/LuckyLizard](fix): Play videos within activity if not canary

Merged Olivia Madrid requested to merge fix/video-play-outside-canary-1761 into master

For non-canary users, clicking videos should play from the feed activity, not go to the media page. (Canary users go to media modal)

Closes #1761 (closed) and #1764 (closed)

Edited by Olivia Madrid

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
181 181 class: 'm-overlayModal--media'
182 182 }).present();
183 183 } else {
184 this.router.navigate([`/media/${this.activity.entity_guid}`]);
184 if (this.activity.custom_type !== 'video'){
  • 392 398 }
    393 399
    394 400 requestMediaModal() {
    395 if (!this.canPlayThrough) {
    401 if (!this.metadataLoaded) {
    396 402 return;
    397 403 }
    398 404
    399 if (this.isModal) {
    405 let isMediaPage = false;
    406 if (!this.isModal && !this.isActivity){
  • Ben approved this merge request

    approved this merge request

  • Olivia Madrid added 3 commits

    added 3 commits

    • 6a48c5b1 - 1 commit from branch master
    • 5df80b06 - Merge branch 'master' of gitlab.com:minds/front into fix/video-play-outside-canary-1761
    • 078c20db - (fix): added some spaces between brackets

    Compare with previous version

  • mentioned in issue #1799 (closed)

  • Mark Harding added 1 commit

    added 1 commit

    • 9a67b4f1 - (fix): do not loop navigation when on full media page

    Compare with previous version

  • Mark Harding approved this merge request

    approved this merge request

  • Mark Harding enabled an automatic merge when the pipeline for 9a67b4f1 succeeds

    enabled an automatic merge when the pipeline for 9a67b4f1 succeeds

  • Mark Harding canceled the automatic merge

    canceled the automatic merge

  • Mark Harding mentioned in commit e5686249

    mentioned in commit e5686249

  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Please register or sign in to reply
    Loading