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

add muted option to embeddable player #909

Merged
merged 12 commits into from
Jun 12, 2017
Merged

add muted option to embeddable player #909

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
631a820
Add muted option to EmbedController
tjenkinson Jun 12, 2017
f2e56de
Add muted data attribute in embeddable player view
tjenkinson Jun 12, 2017
5bf1a77
Add 'muted' option to embeddable player documentation
tjenkinson Jun 12, 2017
48caea4
pass muted option through to PlayerContainer
tjenkinson Jun 12, 2017
a1d024c
pass muted option through to PlayerController
tjenkinson Jun 12, 2017
deafd24
correctly pass muted through to PlayerController
tjenkinson Jun 12, 2017
155d538
Add initialVolume option to Player
tjenkinson Jun 12, 2017
8955475
set initial volume on player depending on muted option
tjenkinson Jun 12, 2017
1033aca
fix typo in PlayerController
tjenkinson Jun 12, 2017
42063fa
fix mistake in PlayerContainer
tjenkinson Jun 12, 2017
62eb685
fix another mistake in PlayerContainer
tjenkinson Jun 12, 2017
92a64c6
Merge pull request #908 from LA1TV/embeddable-player-muted-option
tjenkinson Jun 12, 2017
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
Prev Previous commit
Next Next commit
pass muted option through to PlayerContainer
  • Loading branch information
@tjenkinson
tjenkinson authored Jun 12, 2017
commit 48caea48331a12077218f4296ed2802cabef2a6e
5 changes: 3 additions & 2 deletions app/assets/src/app/pages/embed/player-page.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ $(document).ready(function() {
var autoPlayVod = $(this).attr("data-auto-play-vod") === "1";
var autoPlayStream = $(this).attr("data-auto-play-stream") === "1";
var vodPlayStartTime = $(this).attr("data-vod-play-start-time") === "" ? null : parseInt($(this).attr("data-vod-play-start-time"));
var muted = $(this).attr("data-muted") === "1";
var ignoreExternalStreamUrl = $(this).attr("data-ignore-external-stream-url") === "1";
var bottomBarMode = $(this).attr("data-hide-bottom-bar") === "1" ? "none" : "full";
var initialVodQualityId = $(this).attr("data-initial-vod-quality-id") === "" ? null : parseInt($(this).attr("data-initial-vod-quality-id"));
Expand All @@ -75,7 +76,7 @@ $(document).ready(function() {
require(["app/components/player-container"], function(PlayerContainer) {

// replace the player-container on the dom with the PlayerContainerComponent element when the component has loaded.
playerContainer = new PlayerContainer(playerInfoUri, registerWatchingUri, registerLikeUri, recommendationsUri, enableAdminOverride, loginRequiredMsg, embedded, autoPlayVod, autoPlayStream, vodPlayStartTime, ignoreExternalStreamUrl, bottomBarMode, initialVodQualityId, initialStreamQualityId, disableFullScreen, placeQualitySelectionComponentInPlayer, showTitleInPlayer, disablePlayerControls, enableSmartAutoPlay);
playerContainer = new PlayerContainer(playerInfoUri, registerWatchingUri, registerLikeUri, recommendationsUri, enableAdminOverride, loginRequiredMsg, embedded, autoPlayVod, autoPlayStream, vodPlayStartTime, ignoreExternalStreamUrl, bottomBarMode, initialVodQualityId, initialStreamQualityId, disableFullScreen, placeQualitySelectionComponentInPlayer, showTitleInPlayer, disablePlayerControls, enableSmartAutoPlay, muted);

playerContainer.onLoaded(function() {

Expand Down Expand Up @@ -178,4 +179,4 @@ $(document).ready(function() {
});

});
});
});