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

Integrate Media Player to 2.5.0 into Simorgh #5161

Closed
wants to merge 17 commits into from
Closed

Integrate Media Player to 2.5.0 into Simorgh #5161

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
b9aafbb
Bump Media Player to 2.5.0
simonsinclair Jan 15, 2020
b5f6f9e
Merge branch 'latest' of https://github.com/bbc/simorgh into bump-med…
simonsinclair Jan 15, 2020
4f5a997
Update related snapshots
simonsinclair Jan 15, 2020
97467b3
Merge branch 'latest' into bump-media-player
oluoluoxenfree Jan 15, 2020
32f3124
Merge branch 'latest' into bump-media-player
FK78 Jan 16, 2020
7d132ea
Merge branch 'latest' into bump-media-player
simonsinclair Jan 16, 2020
d1a899d
Merge branch 'latest' into bump-media-player
simonsinclair Jan 16, 2020
b7b7a34
Merge branch 'latest' into bump-media-player
FK78 Jan 16, 2020
f762b7f
Fix duplicate dependencies
simonsinclair Jan 16, 2020
0a9dcb7
Merge branch 'latest' into bump-media-player
simonsinclair Jan 17, 2020
8fab695
Merge branch 'latest' of https://github.com/bbc/simorgh into bump-med…
simonsinclair Jan 17, 2020
15060f5
Fix duplicate dependencies
simonsinclair Jan 17, 2020
3a6bef2
Merge branch 'latest' of https://github.com/bbc/simorgh into bump-med…
simonsinclair Jan 17, 2020
59d6778
Fix duplicate dependencies
simonsinclair Jan 17, 2020
eb49a00
Fix package-lock.json
simonsinclair Jan 17, 2020
49d1391
Merge branch 'latest' into bump-media-player
amywalkerdev Jan 20, 2020
4d0a5c9
Merge branch 'latest' into bump-media-player
rhenshaw56 Jan 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
39 changes: 29 additions & 10 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
"@bbc/psammead-inline-link": "^1.3.18",
"@bbc/psammead-locales": "^4.1.1",
"@bbc/psammead-media-indicator": "^2.6.19",
"@bbc/psammead-media-player": "^2.4.1",
"@bbc/psammead-media-player": "^2.5.0",
"@bbc/psammead-navigation": "^3.0.5",
"@bbc/psammead-paragraph": "^2.2.20",
"@bbc/psammead-rich-text-transforms": "^2.0.0",
Expand Down
2 changes: 1 addition & 1 deletion src/app/containers/ArticleMediaPlayer/__snapshots__/index.test.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,12 +203,12 @@ exports[`MediaPlayer Calls the canonical media player, with a placeholder 1`] =
}

.c4 {
cursor: pointer;
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
cursor: default;
}

.c9 {
Expand Down
27 changes: 18 additions & 9 deletions src/app/containers/CpsAssetMediaPlayer/__snapshots__/index.test.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,13 +132,18 @@ exports[`MediaPlayer render the canonical player without a placeholder 1`] = `
}

.c3 {
left: 0;
overflow: hidden;
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
}

.c4 {
border: 0;
overflow: hidden;
height: 100%;
width: 100%;
}

@media (max-width:63rem) {
Expand Down Expand Up @@ -197,14 +202,18 @@ exports[`MediaPlayer render the canonical player without a placeholder 1`] = `
<div
class="c2"
>
<iframe
allow="autoplay; fullscreen"
allowfullscreen=""
<div
class="c3"
scrolling="no"
src="https://polling.test.bbc.co.uk/ws/av-embeds/cps/pidgin/123456789/p01k6msp/en-GB"
title="Media player"
/>
>
<iframe
allow="autoplay; fullscreen"
allowfullscreen=""
class="c4"
scrolling="no"
src="https://polling.test.bbc.co.uk/ws/av-embeds/cps/pidgin/123456789/p01k6msp/en-GB"
title="Media player"
/>
</div>
</div>
</figure>
</div>
Expand Down
Loading