Skip to content

Commit

Permalink
Merge branch 'v1.1.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
juliangarnier committed Dec 27, 2016
2 parents 1226b12 + b76605c commit 25ac8a7
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 25 deletions.
14 changes: 7 additions & 7 deletions anime.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Anime v1.1.2
* Anime v1.1.3
* http://anime-js.com
* JavaScript animation engine
* Copyright (c) 2016 Julian Garnier
Expand All @@ -22,7 +22,7 @@
}
}(this, function () {

var version = '1.1.2';
var version = '1.1.3';

// Defaults

Expand Down Expand Up @@ -69,7 +69,7 @@
var eases = {};
var names = ['Quad', 'Cubic', 'Quart', 'Quint', 'Expo'];
var functions = {
Sine: function(t) { return 1 - Math.cos( t * Math.PI / 2 ); },
Sine: function(t) { return 1 + Math.sin(Math.PI / 2 * t - Math.PI / 2); },
Circ: function(t) { return 1 - Math.sqrt( 1 - t * t ); },
Elastic: function(t, m) {
if( t === 0 || t === 1 ) return t;
Expand Down Expand Up @@ -391,11 +391,11 @@
}

var getTweensDuration = function(tweens) {
if (tweens.length) return Math.max.apply(Math, tweens.map(function(tween){ return tween.totalDuration; }));
return Math.max.apply(Math, tweens.map(function(tween){ return tween.totalDuration; }));
}

var getTweensDelay = function(tweens) {
if (tweens.length) return Math.min.apply(Math, tweens.map(function(tween){ return tween.delay; }));
return Math.min.apply(Math, tweens.map(function(tween){ return tween.delay; }));
}

// will-change
Expand Down Expand Up @@ -513,8 +513,8 @@
anim.settings = mergeObjects(params, defaultSettings);
anim.properties = getProperties(params, anim.settings);
anim.tweens = getTweens(anim.animatables, anim.properties);
anim.duration = getTweensDuration(anim.tweens) || params.duration;
anim.delay = getTweensDelay(anim.tweens) || params.delay;
anim.duration = anim.tweens.length ? getTweensDuration(anim.tweens) : params.duration;
anim.delay = anim.tweens.length ? getTweensDelay(anim.tweens) : params.delay;
anim.currentTime = 0;
anim.progress = 0;
anim.ended = false;
Expand Down
36 changes: 18 additions & 18 deletions anime.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 25ac8a7

Please sign in to comment.