summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAndrej Mihajlov <and@codeispoetry.ru>2017-06-26 11:40:31 +0300
committerAndrej Mihajlov <and@codeispoetry.ru>2017-06-26 11:40:31 +0300
commitdbafeda02cc3b490fb704ab7ba7b23a6cd5d9abe (patch)
tree0ecb7f7fa827ffed2c3fb633055eceae2c8484e8
parent9274082354574f5ecf91c376f8c03246d6cad4d4 (diff)
parentcf7daf19bcf97037428eac19b989e4192d4c235c (diff)
downloadmullvadvpn-dbafeda02cc3b490fb704ab7ba7b23a6cd5d9abe.tar.xz
mullvadvpn-dbafeda02cc3b490fb704ab7ba7b23a6cd5d9abe.zip
Merge branch 'feature/flow-typed/keyframe-tuple'
-rw-r--r--app/lib/keyframe-animation.js7
1 files changed, 4 insertions, 3 deletions
diff --git a/app/lib/keyframe-animation.js b/app/lib/keyframe-animation.js
index 0b6779ce93..62d9be6cd8 100644
--- a/app/lib/keyframe-animation.js
+++ b/app/lib/keyframe-animation.js
@@ -10,6 +10,7 @@ export type KeyframeAnimationOptions = {
beginFromCurrentState?: boolean,
advanceTo?: 'end'
};
+export type KeyframeAnimationRange = [number, number];
export default class KeyframeAnimation {
@@ -22,7 +23,7 @@ export default class KeyframeAnimation {
_onFinish: ?OnFinishFn;
_nativeImages: Array<NativeImage>;
- _frameRange: Array<number>;
+ _frameRange: KeyframeAnimationRange;
_numFrames: number;
_currentFrame: number = 0;
@@ -58,7 +59,7 @@ export default class KeyframeAnimation {
get isFinished(): boolean { return this._isFinished; }
// create animation from files matching filename pattern. i.e (bubble-frame-{}.png)
- static fromFilePattern(filePattern: string, range: Array<number>): KeyframeAnimation {
+ static fromFilePattern(filePattern: string, range: KeyframeAnimationRange): KeyframeAnimation {
const images: Array<NativeImage> = [];
if(range.length !== 2 || range[0] > range[1]) {
@@ -205,7 +206,7 @@ export default class KeyframeAnimation {
}
}
- _nextFrame(cur: number, frameRange: Array<number>, isReverse: boolean): number {
+ _nextFrame(cur: number, frameRange: KeyframeAnimationRange, isReverse: boolean): number {
if(isReverse) {
if(cur < frameRange[0]) {
return cur + 1;