Skip to content

Commit d7e85d0

Browse files
committed
v1.10.0
1 parent 684d775 commit d7e85d0

File tree

6 files changed

+32
-32
lines changed

6 files changed

+32
-32
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ npm install sprite-timeline
1919
in browser
2020

2121
```html
22-
<script src="https://s0.ssl.qhres.com/!153faae9/sprite-timeline.min.js"></script>
22+
<script src="https://s3.ssl.qhres.com/!a1a19cef/sprite-timeline.min.js"></script>
2323
```
2424

2525
## Demos

dist/sprite-timeline.js

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -181,20 +181,6 @@ var Timeline = function () {
181181
this[_parent] = parent;
182182
}
183183

184-
// timeMark records the reference points on timeline
185-
// Each time we change the playbackRate or currentTime or entropy
186-
// A new timeMark will be generated
187-
// timeMark sorted by entropy
188-
// If you reset entropy, all the timeMarks behind the new entropy
189-
// should be dropped
190-
this[_timeMark] = [{
191-
globalTime: this.globalTime,
192-
localTime: -options.originTime,
193-
entropy: -options.originTime,
194-
playbackRate: options.playbackRate,
195-
globalEntropy: 0
196-
}];
197-
198184
var nowtime = options.nowtime || _nowtime;
199185
if (!parent) {
200186
var createTime = nowtime();
@@ -211,6 +197,20 @@ var Timeline = function () {
211197
});
212198
}
213199

200+
// timeMark records the reference points on timeline
201+
// Each time we change the playbackRate or currentTime or entropy
202+
// A new timeMark will be generated
203+
// timeMark sorted by entropy
204+
// If you reset entropy, all the timeMarks behind the new entropy
205+
// should be dropped
206+
this[_timeMark] = [{
207+
globalTime: this.globalTime,
208+
localTime: -options.originTime,
209+
entropy: -options.originTime,
210+
playbackRate: options.playbackRate,
211+
globalEntropy: 0
212+
}];
213+
214214
if (this[_parent]) {
215215
this[_timeMark][0].globalEntropy = this[_parent].entropy;
216216
}

dist/sprite-timeline.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/index.js

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -65,20 +65,6 @@ var Timeline = function () {
6565
this[_parent] = parent;
6666
}
6767

68-
// timeMark records the reference points on timeline
69-
// Each time we change the playbackRate or currentTime or entropy
70-
// A new timeMark will be generated
71-
// timeMark sorted by entropy
72-
// If you reset entropy, all the timeMarks behind the new entropy
73-
// should be dropped
74-
this[_timeMark] = [{
75-
globalTime: this.globalTime,
76-
localTime: -options.originTime,
77-
entropy: -options.originTime,
78-
playbackRate: options.playbackRate,
79-
globalEntropy: 0
80-
}];
81-
8268
var nowtime = options.nowtime || _nowtime;
8369
if (!parent) {
8470
var createTime = nowtime();
@@ -95,6 +81,20 @@ var Timeline = function () {
9581
});
9682
}
9783

84+
// timeMark records the reference points on timeline
85+
// Each time we change the playbackRate or currentTime or entropy
86+
// A new timeMark will be generated
87+
// timeMark sorted by entropy
88+
// If you reset entropy, all the timeMarks behind the new entropy
89+
// should be dropped
90+
this[_timeMark] = [{
91+
globalTime: this.globalTime,
92+
localTime: -options.originTime,
93+
entropy: -options.originTime,
94+
playbackRate: options.playbackRate,
95+
globalEntropy: 0
96+
}];
97+
9898
if (this[_parent]) {
9999
this[_timeMark][0].globalEntropy = this[_parent].entropy;
100100
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "sprite-timeline",
3-
"version": "1.9.2",
3+
"version": "1.10.0",
44
"description": "Custom timelines for manipulate sprite animation.",
55
"main": "lib/index.js",
66
"esnext": {

src/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class Timeline {
2626
if(parent) {
2727
this[_parent] = parent;
2828
}
29-
29+
3030
const nowtime = options.nowtime || _nowtime;
3131
if(!parent) {
3232
const createTime = nowtime();

0 commit comments

Comments
 (0)