forked from 0x2620/pandora
don't use playInToOut option
This commit is contained in:
parent
7847947dda
commit
b1a2363472
1 changed files with 17 additions and 3 deletions
|
@ -42,7 +42,7 @@ Ox.load('UI', {
|
|||
height: window.innerHeight,
|
||||
invertHighlight: true,
|
||||
paused: options.paused,
|
||||
playInToOut: true,
|
||||
// playInToOut: true,
|
||||
poster: '/' + options.item + '/' + '96p' + data.posterFrame +'.jpg',
|
||||
resolution: pandora.user.ui.videoResolution,
|
||||
showMarkers: false,
|
||||
|
@ -59,7 +59,7 @@ Ox.load('UI', {
|
|||
} : {}, options.out ? {
|
||||
out: options.out
|
||||
} : {}))
|
||||
.bindEvent({
|
||||
.bindEvent(Ox.extend({
|
||||
open: function() {
|
||||
pandora.$player.options({paused: true});
|
||||
var url = document.location.protocol + '//'
|
||||
|
@ -74,7 +74,10 @@ Ox.load('UI', {
|
|||
fullscreen: function(data) {
|
||||
Ox.Fullscreen.toggle();
|
||||
}
|
||||
})
|
||||
}, options['in'] || options.out ? {
|
||||
playing: checkRange,
|
||||
position: checkRange
|
||||
} : {}))
|
||||
);
|
||||
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, {
|
||||
videoFormat: Ox.UI.getVideoFormat(pandora.site.video.formats)
|
||||
});
|
||||
|
|
Loading…
Reference in a new issue