inter-coder
diff --git a/‎dist/jquery.snabbt.min.js
Lines changed: 12 additions & 11 deletions b/‎dist/jquery.snabbt.min.js
Lines changed: 12 additions & 11 deletions
diff --git a/‎dist/snabbt.min.js
Lines changed: 2 additions & 2 deletions b/‎dist/snabbt.min.js
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/animations.js
Lines changed: 32 additions & 4 deletions b/‎src/animations.js
Lines changed: 32 additions & 4 deletions
diff --git a/‎src/easing.js
Lines changed: 0 additions & 2 deletions b/‎src/easing.js
Lines changed: 0 additions & 2 deletions
@@ -20,9 +20,9 @@ snabbtjs.Animation.prototype.assign = function(options) {
 
   this.start_time = 0;
   this.current_time = 0;
+  this._stopped = false;
   // Manual related, should probably be subclassed
   this.value = 0;
-  this.cancelled = false;
 
   if(this.mode === snabbtjs.AnimationType.SPRING) {
     options.equilibrium_position = 1;
@@ -40,8 +40,19 @@ snabbtjs.Animation.prototype.assign = function(options) {
   }
 };
 
+snabbtjs.Animation.prototype.stop = function() {
+  this._stopped = true;
+};
+
+snabbtjs.Animation.prototype.stopped = function() {
+  return this._stopped;
+};
+
 snabbtjs.Animation.prototype.tick = function(time) {
   // If first tick, set start_time
+  if(this._stopped)
+    return;
+
   if(!this.start_time) {
     this.start_time = time;
   }
@@ -71,11 +82,14 @@ snabbtjs.Animation.prototype.set_value = function(value) {
 };
 
 snabbtjs.Animation.prototype.current_state = function() {
-  this.update_current_transition();
+  if(!this._stopped)
+    this.update_current_transition();
   return this._current_state;
 };
 
 snabbtjs.Animation.prototype.completed = function() {
+  if(this._stopped)
+    return true;
   if(this.mode == snabbtjs.AnimationType.TIME) {
     if(this.start_time === 0) {
       return false;
@@ -93,6 +107,9 @@ snabbtjs.Animation.prototype.start_state = function() {
 };
 
 snabbtjs.Animation.prototype.end_state = function() {
+  if(this._stopped)
+    return this.current_state();
+
   if(this.mode == snabbtjs.AnimationType.TIME || this.mode == snabbtjs.AnimationType.SPRING) {
     return this._end_state;
   } else {
@@ -196,17 +213,28 @@ snabbtjs.ScrollAnimation.prototype.completed = function() {
 };
 
 // ------------------------
-// -- AttantionAnimation --
+// -- AttentionAnimation --
 // ------------------------
 
 snabbtjs.AttentionAnimation = function(options) {
   this.movement = options.movement;
   this.current_movement = new snabbtjs.State({});
   options.initial_velocity = 0.1;
   this.spring = new snabbtjs.SpringEasing(options);
+  this._stopped = false;
+};
+
+snabbtjs.AttentionAnimation.prototype.stop = function() {
+  this._stopped = true;
+};
+
+snabbtjs.AttentionAnimation.prototype.stopped = function(time) {
+  return this._stopped;
 };
 
 snabbtjs.AttentionAnimation.prototype.tick = function(time) {
+  if(this._stopped)
+    return;
   if(this.spring.equilibrium)
     return;
   this.spring.tick();
@@ -231,5 +259,5 @@ snabbtjs.AttentionAnimation.prototype.current_state = function() {
 };
 
 snabbtjs.AttentionAnimation.prototype.completed = function() {
-  return this.spring.equilibrium;
+  return this.spring.equilibrium || this._stopped;
 };
@@ -76,7 +76,6 @@ snabbtjs.sinc = function(curr, max) {
 
 
 snabbtjs.SpringEasing = function(options) {
-  console.log(options);
   this.position = snabbtjs.option_or_default(options.start_position, 0);
   this.equilibrium_position = snabbtjs.option_or_default(options.equilibrium_position, 0);
   this.velocity = snabbtjs.option_or_default(options.initial_velocity, 0);
@@ -91,7 +90,6 @@ snabbtjs.SpringEasing.prototype.tick = function() {
   if(this.equilibrium)
     return;
   var spring_force = -(this.position - this.equilibrium_position) * this.spring_constant;
-  //spring_force *= Math.abs(spring_force);
   // f = m * a
   // a = f / m
   var a = spring_force / this.mass;