Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Invis1ble committed Oct 9, 2016
2 parents 9076d54 + b3072b6 commit a1e3de5
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion dist/js/scrollbox.js
Original file line number Diff line number Diff line change
Expand Up @@ -837,7 +837,7 @@ var Scrollbox = function ($) {
if (!$.easing.momentum) {
// easeOutExpo
$.easing.momentum = function (x, t, b, c, d) {
/* eslint eqeqeq: "off" */
/* eslint eqeqeq: 0 */
return t == d ? b + c : c * (-Math.pow(2, -10 * t / d) + 1) + b;
};
}
Expand Down
2 changes: 1 addition & 1 deletion src/js/scrollbox.js
Original file line number Diff line number Diff line change
Expand Up @@ -823,7 +823,7 @@ const Scrollbox = (($) => {
if (!$.easing.momentum) {
// easeOutExpo
$.easing.momentum = (x, t, b, c, d) => {
/* eslint eqeqeq: "off" */
/* eslint eqeqeq: 0 */
return t == d ? b + c : c * (- Math.pow(2, -10 * t / d) + 1) + b;
};
}
Expand Down

0 comments on commit a1e3de5

Please sign in to comment.