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

merge

Browse source
This commit is contained in:
j 2012-02-15 13:16:36 +05:30
commit 52b10e6f14
1 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -41,6 +41,7 @@ Ox.load('UI', {
paused: options.paused, paused: options.paused,
position: options['in'], position: options['in'],
poster: '/' + options.item + '/' + '128p' + options['in'] +'.jpg', poster: '/' + options.item + '/' + '128p' + options['in'] +'.jpg',
resolution: pandora.user.ui.videoResolution,
showMarkers: false, showMarkers: false,
showMilliseconds: 0, showMilliseconds: 0,
timeline: '/' + options.item + '/' + 'timeline16p.png', timeline: '/' + options.item + '/' + 'timeline16p.png',
@ -49,8 +50,17 @@ Ox.load('UI', {
width: document.width width: document.width
}) })
.bindEvent({ .bindEvent({
position: function(data) { playing: checkRange,
if(data.position<options['in'] position: checkRange,
resolution: function(data) {
pandora.api.setUI({'videoResolution': data.resolution});
},
})
);
Ox.UI.hideLoadingScreen();
function checkRange(data) {
if(data.position < options['in']
|| data.position > options.out) { || data.position > options.out) {
if(!pandora.player.options('paused')) { if(!pandora.player.options('paused')) {
pandora.player.togglePaused(); pandora.player.togglePaused();
@ -60,9 +70,6 @@ Ox.load('UI', {
}); });
} }
} }
})
);
Ox.UI.hideLoadingScreen();
}); });
return that; return that;
} }