Skip to content

Commit 6fe38a1

Browse files
committed
Empty Timelines no long return null.
1 parent b0e6d88 commit 6fe38a1

2 files changed

Lines changed: 11 additions & 5 deletions

File tree

v3/src/tween/builder/GetTweens.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@ var GetTweens = function (config)
44
{
55
var tweens = GetValue(config, 'tweens', null);
66

7-
if (typeof tweens === 'function')
7+
if (tweens === null)
8+
{
9+
return [];
10+
}
11+
else if (typeof tweens === 'function')
812
{
913
tweens = tweens.call();
1014
}

v3/src/tween/builder/TimelineBuilder.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,19 @@ var TweenBuilder = require('./TweenBuilder');
1212

1313
var TimelineBuilder = function (manager, config)
1414
{
15-
var defaults = Clone(Defaults);
15+
var timeline = new Timeline(manager);
1616

1717
var tweens = GetTweens(config);
1818

1919
if (tweens.length === 0)
2020
{
21-
return null;
21+
timeline.paused = true;
22+
23+
return timeline;
2224
}
2325

26+
var defaults = Clone(Defaults);
27+
2428
defaults.targets = GetTargets(config);
2529

2630
// totalDuration: If specified each tween in the Timeline is given an equal portion of the totalDuration
@@ -46,8 +50,6 @@ var TimelineBuilder = function (manager, config)
4650
defaults.flipX = GetBoolean(config, 'flipX', defaults.flipX);
4751
defaults.flipY = GetBoolean(config, 'flipY', defaults.flipY);
4852

49-
var timeline = new Timeline(manager);
50-
5153
// Create the Tweens
5254
for (var i = 0; i < tweens.length; i++)
5355
{

0 commit comments

Comments
 (0)