JavaScript animation engine
Merge settings object
Julian Garnierbb6f72f84d37
diff --git a/anime.js b/anime.jsindex 03b53c8c..12204393 100644--- a/anime.js+++ b/anime.js@@ -664,28 +664,27 @@let startTime, lastTime = 0;let instance = createNewInstance(params);+ let settings = instance.settings;instance.tick = function(now) {- instance.completed = false;- let s = instance.settings;if (!startTime) startTime = now;const currentTime = (lastTime + now - startTime) * anime.speed;const instanceTime = Math.min(Math.max(currentTime, 0), instance.duration);setInstanceProgress(instance, instanceTime);if (!instance.began && instanceTime >= instance.delay) {instance.began = true;- if (s.begin) s.begin(instance);+ if (settings.begin) settings.begin(instance);}if (instanceTime >= instance.duration) {if (instance.loop && !isNaN(parseFloat(instance.loop))) instance.loop--;if (instance.loop) {startTime = now;- if (s.direction === 'alternate') toggleInstanceDirection(instance);+ if (settings.direction === 'alternate') toggleInstanceDirection(instance);} else {instance.completed = true;instance.began = false;instance.pause();- if (s.complete) s.complete(instance);+ if (settings.complete) settings.complete(instance);}lastTime = 0;}@@ -706,9 +705,8 @@if (params) instance = mergeObjects(createNewInstance(mergeObjects(params, instance.settings)), instance);startTime = 0;lastTime = instance.completed ? 0 : adjustInstanceTime(instance, instance.currentTime);- let s = instance.settings;- if (s.direction === 'reverse' && !instance.reversed) toggleInstanceDirection(instance);- if (s.direction === 'alternate') {+ if (settings.direction === 'reverse' && !instance.reversed) toggleInstanceDirection(instance);+ if (settings.direction === 'alternate') {if (instance.reversed && !instance.loop % 2) toggleInstanceDirection(instance);if (!instance.loop) instance.loop = 2;}@@ -717,15 +715,16 @@}instance.restart = function() {+ instance.pause();if (instance.reversed) toggleInstanceDirection(instance);+ instance.completed = false;instance.began = false;- instance.loop = instance.settings.loop;- instance.pause();+ instance.loop = settings.loop;instance.seek(0);instance.play();}- if (instance.settings.autoplay) instance.play();+ if (settings.autoplay) instance.restart();instances.push(instance);return instance;diff --git a/documentation/assets/img/anime-js-v2-logo-white.png b/documentation/assets/img/anime-js-v2-logo-white.pngindex cde71c69..59e0e012 100644Binary files a/documentation/assets/img/anime-js-v2-logo-white.png and b/documentation/assets/img/anime-js-v2-logo-white.png differ