Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[FIX] Spotify embed and collapsed #17356

Merged
merged 3 commits into from
Apr 20, 2020
Merged

[FIX] Spotify embed and collapsed #17356

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c6f9890
Switch iframe url to meta twitterPlayer value
ffauvel Apr 18, 2020
12ab31b
Update collapsed behaviour and visual
ffauvel Apr 18, 2020
6041cb3
Merge branch 'develop' into fix-spotify-embed-and-collapsed
gabriellsh Apr 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions app/spotify/lib/client/oembedSpotifyWidget.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,10 @@
{{else}}
<a rel="noopener noreferrer" href="{{url}}">{{{replace meta.ogDescription ", an? (?:song|album) by (.+?) on Spotify" " - $1" regex=true}}}</a>
{{/if}}
{{#if collapsed}}
<span class="collapse-switch icon-right-dir" data-url="{{url}}" data-collapsed="{{collapsed}}"></span>
{{else}}
<span class="collapse-switch icon-down-dir" data-url="{{url}}" data-collapsed="{{collapsed}}"></span>
<iframe width="300" height="380" src="https://embed.spotify.com/?uri={{url}}" rel="noopener noreferrer" frameborder="0"></iframe><br/>
{{/if}}
{{> collapseArrow collapsedMedia=collapsedMediaVar}} <br>
{{#unless collapsed}}
<iframe width="300" height="380" src="{{meta.twitterPlayer}}" rel="noopener noreferrer" frameborder="0"></iframe><br>
{{/unless}}
</blockquote>
{{/if}}
</template>