Skip to content

Commit

Permalink
bugfix
Browse files Browse the repository at this point in the history
  • Loading branch information
natew committed Mar 9, 2015
1 parent 12c6cc0 commit a63e61e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion lib/Scroller.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ var Scroller = function (callback, options) {
scrollingComplete: NOOP,

/** This configures the amount of change applied to deceleration when reaching boundaries **/
penetrationDeceleration : 10,
penetrationDeceleration : 0.03,

/** This configures the amount of change applied to acceleration when reaching boundaries **/
penetrationAcceleration : 0.08
Expand Down
6 changes: 3 additions & 3 deletions lib/animate.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
* Signature of the method should be `function(percent) { return modifiedValue; }`
* @return {Integer} Identifier of animation. Can be used to stop it any time.
*/
exports.start = function (stepCallback, verifyCallback, completedCallback, duration, easingMethod, root) {
exports.start = function (stepCallback, verifyCallback, completedCallback, duration, easingMethod) {
var start = Date.now();
var lastFrame = start;
var percent = 0;
Expand Down Expand Up @@ -130,15 +130,15 @@
completedCallback(desiredFrames - (dropCounter / ((now - start) / millisecondsPerSecond)), id, percent === 1 || duration === undefined);
} else if (render) {
lastFrame = now;
requestAnimationFrame(step, root);
requestAnimationFrame(step);
}
};

// Mark as running
running[id] = true;

// Init first step
requestAnimationFrame(step, root);
requestAnimationFrame(step);

// Return unique animation ID
return id;
Expand Down

0 comments on commit a63e61e

Please sign in to comment.