forked from 0x2620/pandora
use playInToOut option in embed player
This commit is contained in:
parent
91706f3bec
commit
4b65bb7dc9
1 changed files with 11 additions and 5 deletions
|
@ -48,15 +48,19 @@ Ox.load('UI', {
|
||||||
enableVolume: true,
|
enableVolume: true,
|
||||||
externalControls: false,
|
externalControls: false,
|
||||||
height: window.innerHeight,
|
height: window.innerHeight,
|
||||||
invertHighlight: true,
|
invertHighlight: options.invertHighlight,
|
||||||
paused: options.paused,
|
paused: options.paused,
|
||||||
// playInToOut: true,
|
playInToOut: options.playInToOut,
|
||||||
poster: '/' + options.item + '/' + '96p' + data.posterFrame +'.jpg',
|
poster: '/' + options.item + '/' + '96p' + data.posterFrame +'.jpg',
|
||||||
resolution: pandora.user.ui.videoResolution,
|
resolution: pandora.user.ui.videoResolution,
|
||||||
showMarkers: false,
|
showMarkers: false,
|
||||||
showMilliseconds: 0,
|
showMilliseconds: 0,
|
||||||
subtitles: data.subtitles,
|
subtitles: data.subtitles,
|
||||||
timeline: '/' + options.item + '/' + 'timeline16p.png',
|
timeline: options.playInToOut ? function(size, i) {
|
||||||
|
return '/' + options.item
|
||||||
|
+ '/timelineantialias'
|
||||||
|
+ size + 'p' + i + '.jpg'
|
||||||
|
} : '/' + options.item + '/' + 'timeline16p.png',
|
||||||
title: result.data.title,
|
title: result.data.title,
|
||||||
video: data.video,
|
video: data.video,
|
||||||
width: window.innerWidth
|
width: window.innerWidth
|
||||||
|
@ -82,7 +86,7 @@ Ox.load('UI', {
|
||||||
fullscreen: function(data) {
|
fullscreen: function(data) {
|
||||||
Ox.Fullscreen.toggle();
|
Ox.Fullscreen.toggle();
|
||||||
}
|
}
|
||||||
}, options['in'] || options.out ? {
|
}, ((options['in'] || options.out) && !options.playInToOut) ? {
|
||||||
playing: checkRange,
|
playing: checkRange,
|
||||||
position: checkRange
|
position: checkRange
|
||||||
} : {}))
|
} : {}))
|
||||||
|
@ -259,8 +263,10 @@ Ox.load('UI', {
|
||||||
item: window.location.pathname.slice(1).split('/')[0]
|
item: window.location.pathname.slice(1).split('/')[0]
|
||||||
},
|
},
|
||||||
defaults = {
|
defaults = {
|
||||||
|
invertHighlight: true,
|
||||||
|
paused: true,
|
||||||
|
playInToOut: true,
|
||||||
view: 'video',
|
view: 'video',
|
||||||
paused: true
|
|
||||||
};
|
};
|
||||||
vars.forEach(function(v) {
|
vars.forEach(function(v) {
|
||||||
var kv = v.split('='), k = kv[0], v = kv[1];
|
var kv = v.split('='), k = kv[0], v = kv[1];
|
||||||
|
|
Loading…
Reference in a new issue