Push dev work to master #2

Merged
sixteenmillimeter merged 416 commits from dev into master 2018-07-19 15:29:02 +00:00
1 changed files with 3 additions and 3 deletions
Showing only changes of commit d511ecdfbe - Show all commits

View File

@ -269,8 +269,8 @@ intval.frame = function (dir = null, time = null) {
if (time === null && intval._state.time !== 0) { if (time === null && intval._state.time !== 0) {
time = intval._state.time time = intval._state.time
} else { } else if (time === null) {
time = 0 time = 0 //default speed
} }
intval._state.frame.start = +new Date() intval._state.frame.start = +new Date()
@ -284,7 +284,7 @@ intval.frame = function (dir = null, time = null) {
} else { } else {
intval._startBwd() intval._startBwd()
} }
if (time !== null && time !== 0) { if (time !== 0) {
setTimeout(intval._pause, intval._state.frame.open) setTimeout(intval._pause, intval._state.frame.open)
if (dir) { if (dir) {
setTimeout(intval._startFwd, (time - intval._state.frame.open)) setTimeout(intval._startFwd, (time - intval._state.frame.open))