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

fix timeline for edits with 0 duration clips

Browse source
This commit is contained in:
j 2021-08-06 14:39:48 +02:00
parent 0a7b6c0452
commit 0ba80ada1f
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
static/js/editPanel.js
View file

@ -673,6 +673,10 @@ pandora.ui.editPanel = function(isEmbed) {
timelineIteration = self.timelineIteration = Ox.uid(); timelineIteration = self.timelineIteration = Ox.uid();
Ox.serialForEach(edit.clips, function(clip) { Ox.serialForEach(edit.clips, function(clip) {
var callback = Ox.last(arguments); var callback = Ox.last(arguments);
if (!clip.duration) {
callback()
return;
}
pandora[ pandora[
fps == 1 ? 'getSmallClipTimelineURL' : 'getLargeClipTimelineURL' fps == 1 ? 'getSmallClipTimelineURL' : 'getLargeClipTimelineURL'
](clip.item, clip['in'], clip.out, ui.videoTimeline, function(url) { ](clip.item, clip['in'], clip.out, ui.videoTimeline, function(url) {

3
static/js/utils.js
View file

@ -1761,6 +1761,9 @@ pandora.getLargeEditTimelineURL = function(edit, type, i, callback) {
if (clipIn >= timelineOut) { if (clipIn >= timelineOut) {
return false; // break return false; // break
} }
if (!clip.duration) {
return;
}
if ( if (
(timelineIn <= clipIn && clipIn <= timelineOut) (timelineIn <= clipIn && clipIn <= timelineOut)
|| (timelineIn <= clipOut && clipOut <= timelineOut) || (timelineIn <= clipOut && clipOut <= timelineOut)