Skip to content

Commit 15b6cde

Browse files
committed
deprecate(Tween#seek): it not works as excepted, PR's are welcome for fix without loss (or less loss) of performance
config(change): change to latest timing(repeat): now uses delayTime as repeatDelay for reducing config with more complexity feat(startTime): now accepts relative timing
1 parent e851164 commit 15b6cde

File tree

7 files changed

+35
-95
lines changed

7 files changed

+35
-95
lines changed

API.md

Lines changed: 5 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,6 @@ import {Tween} from 'es6-tween/src/Tween.Lite'let tween = new Tween({x:0}).to(
307307
* [.stop()](#Lite+stop)
308308
* [.delay(amount)](#Lite+delay)
309309
* [.repeat(amount)](#Lite+repeat)
310-
* [.repeatDelay(amount)](#Lite+repeatDelay)
311310
* [.reverseDelay(amount)](#Lite+reverseDelay)
312311
* [.yoyo(state)](#Lite+yoyo)
313312
* [.easing(_easingFunction)](#Lite+easing)
@@ -483,21 +482,6 @@ Sets how times tween is repeating
483482
```js
484483
tween.repeat(2)
485484
```
486-
<a name="Lite+repeatDelay"></a>
487-
488-
### lite.repeatDelay(amount)
489-
Set delay of each repeat of tween
490-
491-
**Kind**: instance method of [<code>Lite</code>](#Lite)
492-
493-
| Param | Type | Description |
494-
| --- | --- | --- |
495-
| amount | <code>number</code> | Sets tween repeat delay / repeat wait duration |
496-
497-
**Example**
498-
```js
499-
tween.repeatDelay(500)
500-
```
501485
<a name="Lite+reverseDelay"></a>
502486

503487
### lite.reverseDelay(amount)
@@ -703,14 +687,13 @@ let tween = new Tween(myNode, {width:'100px'}).to({width:'300px'}, 2000).start()
703687
* [.pause()](#Tween+pause)
704688
* [.play()](#Tween+play)
705689
* [.restart([noDelay])](#Tween+restart)
706-
* [.seek(time, [keepPlaying])](#Tween+seek)
690+
* ~~[.seek(time, [keepPlaying])](#Tween+seek)~~
707691
* [.duration(amount)](#Tween+duration)
708692
* [.to(properties, [duration])](#Tween+to)
709693
* [.start(time)](#Tween+start)
710694
* [.stop()](#Tween+stop)
711695
* [.delay(amount)](#Tween+delay)
712696
* [.repeat(amount)](#Tween+repeat)
713-
* [.repeatDelay(amount)](#Tween+repeatDelay)
714697
* [.reverseDelay(amount)](#Tween+reverseDelay)
715698
* [.yoyo(state, [_easingReverse])](#Tween+yoyo)
716699
* [.easing(_easingFunction)](#Tween+easing)
@@ -799,8 +782,10 @@ tween.restart()
799782
```
800783
<a name="Tween+seek"></a>
801784

802-
### tween.seek(time, [keepPlaying])
803-
Seek tween value by `time`
785+
### ~~tween.seek(time, [keepPlaying])~~
786+
***Deprecated***
787+
788+
Seek tween value by `time`. Note: Not works as excepted. PR are welcome
804789

805790
**Kind**: instance method of [<code>Tween</code>](#Tween)
806791

@@ -899,21 +884,6 @@ Sets how times tween is repeating
899884
```js
900885
tween.repeat(5)
901886
```
902-
<a name="Tween+repeatDelay"></a>
903-
904-
### tween.repeatDelay(amount)
905-
Set delay of each repeat of tween
906-
907-
**Kind**: instance method of [<code>Tween</code>](#Tween)
908-
909-
| Param | Type | Description |
910-
| --- | --- | --- |
911-
| amount | <code>number</code> | Sets tween repeat delay / repeat wait duration |
912-
913-
**Example**
914-
```js
915-
tween.repeatDelay(400)
916-
```
917887
<a name="Tween+reverseDelay"></a>
918888

919889
### tween.reverseDelay(amount)

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "es6-tween",
3-
"version": "3.8.22",
3+
"version": "3.8.23",
44
"description": "ES6 implementation of amazing tween.js",
55
"browser": "full/Tween.min.js",
66
"cdn": "full/Tween.min.js",
@@ -9,7 +9,6 @@
99
"directories": {
1010
"example": "examples"
1111
},
12-
"types": "typings/Tween.d.ts",
1312
"scripts": {
1413
"source": "rollup -c",
1514
"minify": "uglifyjs full/Tween.js -c -m -o full/Tween.min.js --source-map \"filename='full/Tween.min.js.map'\"",

rollup.config.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,16 @@ var plugins = [
1313
]
1414

1515
export default {
16-
entry: 'src/index.js',
16+
input: 'src/index.js',
17+
output: {
1718
format: 'umd',
18-
dest: 'full/Tween.js',
19+
file: 'full/Tween.js'
20+
},
1921
globals: {
2022
'intertween': 'InterTween'
2123
},
22-
sourceMap: true,
24+
sourcemap: true,
2325
context: 'this',
24-
moduleName: 'TWEEN',
26+
name: 'TWEEN',
2527
plugins: plugins
2628
}

rollup.config.lite.js

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
export default {
2-
entry: 'src/index.lite.js',
3-
dest: 'lite/Tween.js',
4-
format: 'umd',
5-
sourceMap: true,
2+
input: 'src/index.lite.js',
3+
output: {
4+
file: 'lite/Tween.js',
5+
format: 'umd'
6+
},
7+
sourcemap: true,
68
context: 'this',
7-
moduleName: 'TWEEN'
9+
name: 'TWEEN'
810
}

ts/Timeline.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,6 @@ class Timeline extends Tween {
246246
const {
247247
_tweens,
248248
_duration,
249-
_repeatDelayTime,
250249
_reverseDelayTime,
251250
_startTime,
252251
_reversed,
@@ -290,9 +289,7 @@ class Timeline extends Tween {
290289
this.timingOrder(timing => timing.reverse());
291290
}
292291

293-
if (!_reversed && _repeatDelayTime) {
294-
this._startTime = time + _repeatDelayTime;
295-
} else if (_reversed && _reverseDelayTime) {
292+
if (_reversed && _reverseDelayTime) {
296293
this._startTime = time + _reverseDelayTime;
297294
} else {
298295
this._startTime = time;

ts/Tween.ts

Lines changed: 8 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ class Tween extends EventClass {
5252
public _startTime: number;
5353
public _initTime: number;
5454
public _delayTime: number;
55-
public _repeatDelayTime: number;
5655
public _reverseDelayTime: number;
5756
public _repeat: number;
5857
public _yoyo: boolean;
@@ -244,23 +243,20 @@ class Tween extends EventClass {
244243
}
245244

246245
/**
247-
* Seek tween value by `time`
246+
* Seek tween value by `time`. Note: Not works as excepted. PR are welcome
248247
* @param {Time} time Tween update time
249248
* @param {boolean=} keepPlaying When this param is set to `false`, tween pausing after seek
250249
* @example tween.seek(500)
251250
* @memberof Tween
251+
* @deprecated
252252
*/
253253
public seek(time: number, keepPlaying?: boolean) {
254-
const { _duration, _repeat, _initTime } = this;
254+
const { _duration, _repeat, _initTime, _startTime } = this;
255255

256-
let updateTime: number = _initTime + time;
256+
let updateTime: number = _startTime + time;
257257
this._isPlaying = true;
258258

259-
if (keepPlaying) {
260-
add(this);
261-
}
262-
263-
this.update(updateTime, false, true);
259+
this.update(time, false);
264260

265261
this.emit(EVENT_SEEK, time, this.object);
266262

@@ -439,19 +435,6 @@ class Tween extends EventClass {
439435
return this;
440436
}
441437

442-
/**
443-
* Set delay of each repeat of tween
444-
* @param {number} amount Sets tween repeat delay / repeat wait duration
445-
* @example tween.repeatDelay(400)
446-
* @memberof Tween
447-
*/
448-
public repeatDelay(amount: number) {
449-
this._repeatDelayTime =
450-
typeof amount === 'function' ? amount(this._repeatDelayTime) : amount;
451-
452-
return this;
453-
}
454-
455438
/**
456439
* Set delay of each repeat alternate of tween
457440
* @param {number} amount Sets tween repeat alternate delay / repeat alternate wait duration
@@ -536,7 +519,7 @@ class Tween extends EventClass {
536519
_easingFunction,
537520
_easingReverse,
538521
_repeat,
539-
_repeatDelayTime,
522+
_delayTime,
540523
_reverseDelayTime,
541524
_yoyo,
542525
_reversed,
@@ -603,9 +586,9 @@ class Tween extends EventClass {
603586
this.emit(_yoyo && !_reversed ? EVENT_REVERSE : EVENT_REPEAT, object);
604587

605588
if (_reversed && _reverseDelayTime) {
606-
this._startTime += _duration - _reverseDelayTime;
589+
this._startTime = time - _reverseDelayTime;
607590
} else {
608-
this._startTime += _duration;
591+
this._startTime = time + _delayTime;
609592
}
610593

611594
return true;

ts/lite.ts

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ class Lite {
2626
public _interpolationFunction: Function;
2727
public _startTime: number;
2828
public _delayTime: number;
29-
public _repeatDelayTime: number;
3029
public _reverseDelayTime: number;
3130
public _repeat: number;
3231
public _yoyo: boolean;
@@ -196,7 +195,10 @@ class Lite {
196195
* @memberof Lite
197196
*/
198197
public start(time?: number) {
199-
this._startTime = time !== undefined ? time : now();
198+
this._startTime =
199+
time !== undefined
200+
? typeof time === 'string' ? now() + parseFloat(time) : time
201+
: now();
200202
this._startTime += this._delayTime;
201203

202204
const {
@@ -334,19 +336,6 @@ class Lite {
334336
return this;
335337
}
336338

337-
/**
338-
* Set delay of each repeat of tween
339-
* @param {number} amount Sets tween repeat delay / repeat wait duration
340-
* @example tween.repeatDelay(500)
341-
* @memberof Lite
342-
*/
343-
public repeatDelay(amount: number) {
344-
this._repeatDelayTime =
345-
typeof amount === 'function' ? amount(this._repeatDelayTime) : amount;
346-
347-
return this;
348-
}
349-
350339
/**
351340
* Set delay of each repeat alternate of tween
352341
* @param {number} amount Sets tween repeat alternate delay / repeat alternate wait duration
@@ -415,7 +404,7 @@ class Lite {
415404
_onStartCallbackFired,
416405
_easingFunction,
417406
_repeat,
418-
_repeatDelayTime,
407+
_delayTime,
419408
_reverseDelayTime,
420409
_yoyo,
421410
_reversed,
@@ -490,12 +479,10 @@ class Lite {
490479
this._reversed = !_reversed;
491480
}
492481

493-
if (!_reversed && _repeatDelayTime) {
494-
this._startTime = time + _repeatDelayTime;
495-
} else if (_reversed && _reverseDelayTime) {
482+
if (_reversed && _reverseDelayTime) {
496483
this._startTime = time + _reverseDelayTime;
497484
} else {
498-
this._startTime = time;
485+
this._startTime = time + _delayTime;
499486
}
500487

501488
return true;

0 commit comments

Comments
 (0)