decentral1se/pandora
1
0
Fork 0
forked from 0x2620/pandora
Code Issues Pull requests Projects Releases Wiki Activity

in embed player, support position option

Browse source
This commit is contained in:
rolux 2013-02-16 12:50:20 +05:30
parent 2034d5b40f
commit d520582f00
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
static/js/embed/pandora.js
View file

@ -51,7 +51,12 @@ Ox.load('UI', {
invertHighlight: options.invertHighlight, invertHighlight: options.invertHighlight,
paused: options.paused, paused: options.paused,
playInToOut: options.playInToOut, playInToOut: options.playInToOut,
poster: '/' + options.item + '/' + '96p' + data.posterFrame +'.jpg', position: options.position || 0,
poster: '/' + options.item + '/' + '96p' + (
options.position !== void 0 ? options.position
: options['in'] !== void 0 ? options['in']
: data.posterFrame
) +'.jpg',
resolution: pandora.user.ui.videoResolution, resolution: pandora.user.ui.videoResolution,
showMarkers: false, showMarkers: false,
showMilliseconds: 0, showMilliseconds: 0,
@ -66,8 +71,6 @@ Ox.load('UI', {
width: window.innerWidth width: window.innerWidth
}, options['in'] ? { }, options['in'] ? {
'in': options['in'], 'in': options['in'],
position: options['in'],
poster: '/' + options.item + '/' + '96p' + options['in'] +'.jpg',
} : {}, options.out ? { } : {}, options.out ? {
out: options.out out: options.out
} : {})) } : {}))
@ -284,6 +287,9 @@ Ox.load('UI', {
} }
}); });
options = Ox.extend({}, defaults, query); options = Ox.extend({}, defaults, query);
if (!options.position) {
options.position = options['in'] || 0;
}
if (!options['in'] && !options.out) { if (!options['in'] && !options.out) {
options.playInToOut = false; options.playInToOut = false;
} }