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

don't use playInToOut option

Browse source
This commit is contained in:
rolux 2013-02-12 13:53:50 +05:30
parent 7847947dda
commit b1a2363472
1 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -42,7 +42,7 @@ Ox.load('UI', {
height: window.innerHeight, height: window.innerHeight,
invertHighlight: true, invertHighlight: true,
paused: options.paused, paused: options.paused,
playInToOut: true, // playInToOut: true,
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,
@ -59,7 +59,7 @@ Ox.load('UI', {
} : {}, options.out ? { } : {}, options.out ? {
out: options.out out: options.out
} : {})) } : {}))
.bindEvent({ .bindEvent(Ox.extend({
open: function() { open: function() {
pandora.$player.options({paused: true}); pandora.$player.options({paused: true});
var url = document.location.protocol + '//' var url = document.location.protocol + '//'
@ -74,7 +74,10 @@ Ox.load('UI', {
fullscreen: function(data) { fullscreen: function(data) {
Ox.Fullscreen.toggle(); Ox.Fullscreen.toggle();
} }
}) }, options['in'] || options.out ? {
playing: checkRange,
position: checkRange
} : {}))
); );
Ox.UI.hideLoadingScreen(); Ox.UI.hideLoadingScreen();
}); });
@ -129,6 +132,17 @@ Ox.load('UI', {
} }
} }
}); });
function checkRange(data) {
if (
data.position < options['in'] - 0.04
|| data.position > options.out
) {
if (!pandora.$player.options('paused')) {
pandora.$player.togglePaused();
}
pandora.$player.options({position: options['in']});
}
}
Ox.extend(pandora.user, { Ox.extend(pandora.user, {
videoFormat: Ox.UI.getVideoFormat(pandora.site.video.formats) videoFormat: Ox.UI.getVideoFormat(pandora.site.video.formats)
}); });