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

dont return part if it ends at clip in point

Browse source
This commit is contained in:
j 2013-07-14 09:13:48 +00:00
parent 1e9831060c
commit 3484c1e220
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
static/js/pandora/utils.js
View file

@ -589,12 +589,11 @@ pandora.getClipVideos = function(clip, resolution) {
start = clip['in'] || 0, start = clip['in'] || 0,
end = clip.out; end = clip.out;
resolution = resolution || pandora.user.ui.videoResolution; resolution = resolution || pandora.user.ui.videoResolution;
return Ox.flatten(Ox.range(clip.parts).map(function(i) { return Ox.flatten(Ox.range(clip.parts).map(function(i) {
var item = { var item = {
src: pandora.getVideoURL(clip.item, resolution, i + 1) src: pandora.getVideoURL(clip.item, resolution, i + 1)
}; };
if(currentTime + clip.durations[i] < start || currentTime > end) { if(currentTime + clip.durations[i] <= start || currentTime > end) {
item = null; item = null;
} else { } else {
if(currentTime <= start && currentTime + clip.durations[i] > start) { if(currentTime <= start && currentTime + clip.durations[i] > start) {