0x2620/pandora
2
1
Fork 1
Code Issues 1.3k Pull requests Releases Wiki Activity

add volume/loop to embed options

Browse source
This commit is contained in:
j 2018-04-13 14:21:33 +02:00
parent 156f4f255a
commit 0743376917
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
static/js/embedPlayer.js
View file

@ -11,6 +11,7 @@ pandora.ui.embedPlayer = function() {
annotationsRange: ui.annotationsRange, annotationsRange: ui.annotationsRange,
annotationsSort: ui.annotationsSort, annotationsSort: ui.annotationsSort,
invertHighlight: true, invertHighlight: true,
loop: false,
matchRatio: false, matchRatio: false,
paused: true, paused: true,
playInToOut: true, playInToOut: true,
@ -21,6 +22,7 @@ pandora.ui.embedPlayer = function() {
}), }),
showTimeline: false, showTimeline: false,
timeline: ui.videoTimeline, timeline: ui.videoTimeline,
volume: ui.videoVolume,
width: window.innerWidth width: window.innerWidth
}, },
options = getOptions(), options = getOptions(),
@ -29,6 +31,7 @@ pandora.ui.embedPlayer = function() {
$innerPanel, $outerPanel, $innerPanel, $outerPanel,
$title, $player, $controls, $timeline, $annotations; $title, $player, $controls, $timeline, $annotations;
pandora.api.get({id: ui.item, keys: pandora.VIDEO_OPTIONS_KEYS}, function(result) { pandora.api.get({id: ui.item, keys: pandora.VIDEO_OPTIONS_KEYS}, function(result) {
if (removed) { if (removed) {
return; return;
@ -120,7 +123,7 @@ pandora.ui.embedPlayer = function() {
? pandora.site.timelines : [], ? pandora.site.timelines : [],
title: video.title, title: video.title,
video: video.video, video: video.video,
volume: ui.videoVolume, volume: options.volume,
width: options.width width: options.width
}, options['in'] ? { }, options['in'] ? {
'in': options['in'] 'in': options['in']

3
static/js/utils.js
View file

@ -1373,12 +1373,13 @@ pandora.getFoldersWidth = function(section) {
}; };
pandora.getHash = function(state, callback) { pandora.getHash = function(state, callback) {
// FIXME: remove this
var embedKeys = [ var embedKeys = [
'annotationsRange', 'annotationsSort', 'annotationsRange', 'annotationsSort',
'embed', 'embed',
'ignoreRights', 'invertHighlight', 'ignoreRights', 'invertHighlight',
'matchRatio', 'matchRatio',
'paused', 'playInToOut', 'paused', 'playInToOut', 'loop', 'volume',
'showAnnotations', 'showCloseButton', 'showLayers', 'showTimeline', 'showAnnotations', 'showCloseButton', 'showLayers', 'showTimeline',
'timeline', 'title' 'timeline', 'title'
], ],