Skip to content

Commit d5d1dc6

Browse files
committed
make helper to handle numeric timing input
1 parent d7933e7 commit d5d1dc6

File tree

3 files changed

+9
-15
lines changed

3 files changed

+9
-15
lines changed

src/group-constructors.js

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,7 @@
2222
this._parent = null;
2323
this.children = children || [];
2424
this._reparent(this.children);
25-
if (typeof timingInput == 'number') {
26-
if (isNaN(timingInput)) {
27-
timingInput = { duration: 0 };
28-
} else {
29-
timingInput = { duration: timingInput };
30-
}
31-
}
25+
timingInput = shared.numericTimingToObject(timingInput);
3226
this._timingInput = shared.cloneTimingInput(timingInput);
3327
this._timing = shared.normalizeTimingInput(timingInput, true);
3428
this.timing = shared.makeTiming(timingInput, true, this);

src/keyframe-effect-constructor.js

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,7 @@
5656
scope.KeyframeEffect = function(target, effectInput, timingInput) {
5757
this.target = target;
5858

59-
if (typeof timingInput == 'number') {
60-
if (isNaN(timingInput)) {
61-
timingInput = { duration: 0 };
62-
} else {
63-
timingInput = { duration: timingInput };
64-
}
65-
}
59+
timingInput = shared.numericTimingToObject(timingInput);
6660
this._timingInput = shared.cloneTimingInput(timingInput);
6761
this._timing = shared.normalizeTimingInput(timingInput);
6862

src/timing-utilities.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,14 +137,19 @@
137137
return timing;
138138
}
139139

140-
function normalizeTimingInput(timingInput, forGroup) {
140+
function numericTimingToObject(timingInput) {
141141
if (typeof timingInput == 'number') {
142142
if (isNaN(timingInput)) {
143143
timingInput = { duration: 0 };
144144
} else {
145145
timingInput = { duration: timingInput };
146146
}
147147
}
148+
return timingInput;
149+
}
150+
151+
function normalizeTimingInput(timingInput, forGroup) {
152+
timingInput = shared.numericTimingToObject(timingInput);
148153
var timing = makeTiming(timingInput, forGroup);
149154
timing._easing = toTimingFunction(timing.easing);
150155
return timing;
@@ -310,6 +315,7 @@
310315

311316
shared.cloneTimingInput = cloneTimingInput;
312317
shared.makeTiming = makeTiming;
318+
shared.numericTimingToObject = numericTimingToObject;
313319
shared.normalizeTimingInput = normalizeTimingInput;
314320
shared.calculateActiveDuration = calculateActiveDuration;
315321
shared.calculateTimeFraction = calculateTimeFraction;

0 commit comments

Comments
 (0)