From 0ba80ada1f90204d56e159eb8313e4f386267ddf Mon Sep 17 00:00:00 2001 From: j Date: Fri, 6 Aug 2021 14:39:48 +0200 Subject: [PATCH] fix timeline for edits with 0 duration clips --- static/js/editPanel.js | 4 ++++ static/js/utils.js | 3 +++ 2 files changed, 7 insertions(+) diff --git a/static/js/editPanel.js b/static/js/editPanel.js index 21c98623..4ed9447b 100644 --- a/static/js/editPanel.js +++ b/static/js/editPanel.js @@ -673,6 +673,10 @@ pandora.ui.editPanel = function(isEmbed) { timelineIteration = self.timelineIteration = Ox.uid(); Ox.serialForEach(edit.clips, function(clip) { var callback = Ox.last(arguments); + if (!clip.duration) { + callback() + return; + } pandora[ fps == 1 ? 'getSmallClipTimelineURL' : 'getLargeClipTimelineURL' ](clip.item, clip['in'], clip.out, ui.videoTimeline, function(url) { diff --git a/static/js/utils.js b/static/js/utils.js index 574e4a87..861e9b9a 100644 --- a/static/js/utils.js +++ b/static/js/utils.js @@ -1761,6 +1761,9 @@ pandora.getLargeEditTimelineURL = function(edit, type, i, callback) { if (clipIn >= timelineOut) { return false; // break } + if (!clip.duration) { + return; + } if ( (timelineIn <= clipIn && clipIn <= timelineOut) || (timelineIn <= clipOut && clipOut <= timelineOut)