Skip to content

Commit 1076e77

Browse files
committed
Fixed running overtime. Still some slight behavoir differences with the old CSA
1 parent e4e8ad6 commit 1076e77

4 files changed

Lines changed: 4 additions & 4 deletions

File tree

build/CommentCoreLibrary.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -593,7 +593,7 @@ var CoreComment = (function () {
593593
for (var prop in currentMotion) {
594594
if (currentMotion.hasOwnProperty(prop)) {
595595
var m = currentMotion[prop];
596-
this[prop] = m.easing(Math.max(time - m.delay, 0), m.from, m.to - m.from, m.dur);
596+
this[prop] = m.easing(Math.min(Math.max(time - m.delay, 0), m.dur), m.from, m.to - m.from, m.dur);
597597
}
598598
}
599599
}

build/CommentCoreLibrary.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.

src/core/Comment.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ var CoreComment = (function () {
364364
for (var prop in currentMotion) {
365365
if (currentMotion.hasOwnProperty(prop)) {
366366
var m = currentMotion[prop];
367-
this[prop] = m.easing(Math.max(time - m.delay, 0), m.from, m.to - m.from, m.dur);
367+
this[prop] = m.easing(Math.min(Math.max(time - m.delay, 0), m.dur), m.from, m.to - m.from, m.dur);
368368
}
369369
}
370370
}

src/core/Comment.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ class CoreComment implements IComment {
372372
for(var prop in currentMotion){
373373
if(currentMotion.hasOwnProperty(prop)){
374374
var m = <IMotion> currentMotion[prop];
375-
this[prop] = m.easing(Math.max(time - m.delay, 0), m.from, m.to - m.from, m.dur);
375+
this[prop] = m.easing(Math.min(Math.max(time - m.delay, 0), m.dur), m.from, m.to - m.from, m.dur);
376376
}
377377
}
378378
}

0 commit comments

Comments
 (0)