From 77cc60ab64a16e6cb4001a72bff82192f35b8f33 Mon Sep 17 00:00:00 2001 From: Mikael Finstad Date: Fri, 24 Apr 2020 14:39:18 +0800 Subject: [PATCH] fix #14 --- cli.js | 9 ++++----- transitions.js | 4 ++-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/cli.js b/cli.js index cc71ff8..c0a105d 100644 --- a/cli.js +++ b/cli.js @@ -91,11 +91,10 @@ const cli = meow(` const { verbose, transitionName, transitionDuration, width, height, fps, audioFilePath, fontPath, fast, out: outPath } = cli.flags; - if (transitionName || transitionDuration) { - params.defaults.transition = { - name: transitionName, - duration: transitionDuration, - }; + if (transitionName || transitionDuration != null) { + params.defaults.transition = {}; + if (transitionName) params.defaults.transition.name = transitionName; + if (transitionDuration) params.defaults.transition.duration = transitionDuration; } if (fontPath) { diff --git a/transitions.js b/transitions.js index 26cdcf3..0adda68 100644 --- a/transitions.js +++ b/transitions.js @@ -38,8 +38,8 @@ function calcTransition(defaults, transition) { assert(!transitionOrDefault.duration || transitionOrDefault.name, 'Please specify transition name or set duration to 0'); - if (transitionOrDefault.name === 'random') { - transitionOrDefault = { easing: transitionOrDefault.easing, name: getRandomTransition(), duration: 0.5 }; + if (transitionOrDefault.name === 'random' && transitionOrDefault.duration) { + transitionOrDefault = { easing: transitionOrDefault.easing, name: getRandomTransition(), duration: transitionOrDefault.duration }; } const getTransitionByAlias = () => {