Remove garbage from build.js. Build distribution.

build.js

@@ -20,25 +20,25 @@ var includeAllModules = modules.length === 1 && modules[0] === 'ALL';
 var distFileContents = '';
 
 function appendFileContents(fileNames, callback) {
-  
+
   (function readNextFile() {
-    
+
     if (fileNames.length <= 0) {
       return callback();
     }
-    
+
     var fileName = fileNames.shift();
-    
+
     if (!fileName) {
       return readNextFile();
     }
-    
+
     fs.readFile(__dirname + '/' + fileName, function (err, data) {
       if (err) throw err;
       distFileContents += (data + '\n');
       readNextFile();
     });
-    
+
   })();
 }
 
@@ -49,13 +49,13 @@ function ifSpecifiedInclude(moduleName, fileName) {
 var filesToInclude = [
 
   'HEADER.js',
-  
+
   ifSpecifiedInclude('serialization', 'lib/json2.js'),
   ifSpecifiedInclude('text', 'lib/cufon.js'),
-  
+
   'src/log.js',
   'src/observable.js',
-  
+
   'src/util/misc.js',
   'src/util/anim_ease.js',
   'src/util/lang_array.js',
@@ -67,27 +67,23 @@ var filesToInclude = [
   'src/util/dom_style.js',
   'src/util/dom_misc.js',
   'src/util/dom_request.js',
-<<<<<<< HEAD
-=======
-  
->>>>>>> 383665d2363f00dd1a577207837b7dc326e04ed8
-  
+
   ifSpecifiedInclude('easing', 'src/util/anim_ease.js'),
 
   ifSpecifiedInclude('parser', 'src/parser.js'),
-  
+
   'src/gradient.js',
   'src/point.class.js',
   'src/intersection.class.js',
   'src/color.class.js',
-  
+
   'src/static_canvas.class.js',
   ifSpecifiedInclude('interaction', 'src/canvas.class.js'),
-  
+
   'src/canvas.animation.js',
-  
+
   ifSpecifiedInclude('serialization', 'src/canvas.serialization.js'),
-  
+
   'src/object.class.js',
   'src/line.class.js',
   'src/circle.class.js',
@@ -100,13 +96,13 @@ var filesToInclude = [
   'src/path_group.class.js',
   'src/group.class.js',
   'src/image.class.js',
-  
+
   ifSpecifiedInclude('object_straightening', 'src/object_straightening.js'),
-  
+
   ifSpecifiedInclude('image_filters', 'src/image_filters.js'),
-  
+
   ifSpecifiedInclude('text', 'src/text.class.js'),
-  
+
   ifSpecifiedInclude('node', 'src/fabric_node.js')
 ];
 
@@ -116,7 +112,7 @@ appendFileContents(filesToInclude, function() {
       console.log(err);
       throw err;
     }
-    
+
     console.log('Built distribution to dist/all.js');
 
     exec(mininfierCmd, function (error, output) {
@@ -125,7 +121,7 @@ appendFileContents(filesToInclude, function() {
       }
       exec('gzip -c dist/all.min.js > dist/all.min.js.gz', function (error, output) {
         console.log('Gzipped to dist/all.min.js.gz');
-        
+
         exec('ls -l dist', function (error, output) {
           console.log(output.replace(/^.*/, ''));
         });

dist/all.js

@@ -1877,6 +1877,7 @@ fabric.Observable = {
     * @param {Function} [options.onComplete] Callback; invoked when value change is completed
     * @param {Number} [options.startValue=0] Starting value
     * @param {Number} [options.endValue=100] Ending value
+    * @param {Number} [options.byValue=100] Value to modify the property by
     * @param {Function} [options.easing] Easing function
     * @param {Number} [options.duration=500] Duration of change
     */
@@ -1889,16 +1890,17 @@ fabric.Observable = {
       finish = start + duration, time, pos,
       onChange = options.onChange || function() { },
       abort = options.abort || function() { return false; },
-      easing = options.easing || function(pos) { return (-Math.cos(pos * Math.PI) / 2) + 0.5; },
+      easing = options.easing || function(t, b, c, d) {return -c * Math.cos(t/d * (Math.PI/2)) + c + b;},
       startValue = 'startValue' in options ? options.startValue : 0,
       endValue = 'endValue' in options ? options.endValue : 100;
+      byValue = options.byValue || endValue - startValue;
 
     options.onStart && options.onStart();
     
     (function tick() {
       time = +new Date();
-      pos = time > finish ? 1 : (time - start) / duration;
-      onChange(startValue + (endValue - startValue) * easing(pos));
+      currentTime = time > finish ? duration : (time - start);
+      onChange(easing(currentTime, startValue, byValue, duration));
       if (time > finish || abort()) {
         options.onComplete && options.onComplete();
         return;
@@ -1957,6 +1959,202 @@ fabric.Observable = {
   fabric.util.requestAnimFrame = requestAnimFrame;
   fabric.util.loadImage = loadImage;
 })();
+(function(){
+
+	/**
+   * @namespace
+   */
+  fabric.util.ease = { };
+
+	function easeInQuad(t, b, c, d) {
+			return c*(t/=d)*t + b;
+	}
+
+	function easeOutQuad(t, b, c, d) {
+		return -c *(t/=d)*(t-2) + b;
+	}
+
+	function easeInOutQuad(t, b, c, d) {
+		if ((t/=d/2) < 1) return c/2*t*t + b;
+		return -c/2 * ((--t)*(t-2) - 1) + b;
+	}
+
+	function easeInCubic(t, b, c, d) {
+		return c*(t/=d)*t*t + b;
+	}
+
+	function easeOutCubic(t, b, c, d) {
+		return c*((t=t/d-1)*t*t + 1) + b;
+	}
+
+	function easeInOutCubic(t, b, c, d) {
+		if ((t/=d/2) < 1) return c/2*t*t*t + b;
+		return c/2*((t-=2)*t*t + 2) + b;
+	}
+
+	function easeInQuart(t, b, c, d) {
+		return c*(t/=d)*t*t*t + b;
+	}
+
+	function easeOutQuart(t, b, c, d) {
+		return -c * ((t=t/d-1)*t*t*t - 1) + b;
+	}
+
+	function easeInOutQuart(t, b, c, d) {
+		if ((t/=d/2) < 1) return c/2*t*t*t*t + b;
+		return -c/2 * ((t-=2)*t*t*t - 2) + b;
+	}
+
+	function easeInQuint(t, b, c, d) {
+		return c*(t/=d)*t*t*t*t + b;
+	}
+
+	function easeOutQuint(t, b, c, d) {
+		return c*((t=t/d-1)*t*t*t*t + 1) + b;
+	}
+
+	function easeInOutQuint(t, b, c, d) {
+		if ((t/=d/2) < 1) return c/2*t*t*t*t*t + b;
+		return c/2*((t-=2)*t*t*t*t + 2) + b;
+	}
+
+	function easeInSine(t, b, c, d) {
+		return -c * Math.cos(t/d * (Math.PI/2)) + c + b;
+	}
+
+	function easeOutSine(t, b, c, d) {
+		return c * Math.sin(t/d * (Math.PI/2)) + b;
+	}
+
+	function easeInOutSine(t, b, c, d) {
+		return -c/2 * (Math.cos(Math.PI*t/d) - 1) + b;
+	}
+
+	function easeInExpo(t, b, c, d) {
+		return (t==0) ? b : c * Math.pow(2, 10 * (t/d - 1)) + b;
+	}
+
+	function easeOutExpo(t, b, c, d) {
+		return (t==d) ? b+c : c * (-Math.pow(2, -10 * t/d) + 1) + b;
+	}
+
+	function easeInOutExpo(t, b, c, d) {
+		if (t==0) return b;
+		if (t==d) return b+c;
+		if ((t/=d/2) < 1) return c/2 * Math.pow(2, 10 * (t - 1)) + b;
+		return c/2 * (-Math.pow(2, -10 * --t) + 2) + b;
+	}
+
+	function easeInCirc(t, b, c, d) {
+		return -c * (Math.sqrt(1 - (t/=d)*t) - 1) + b;
+	}
+
+	function easeOutCirc(t, b, c, d) {
+		return c * Math.sqrt(1 - (t=t/d-1)*t) + b;
+	}
+
+	function easeInOutCirc(t, b, c, d) {
+		if ((t/=d/2) < 1) return -c/2 * (Math.sqrt(1 - t*t) - 1) + b;
+		return c/2 * (Math.sqrt(1 - (t-=2)*t) + 1) + b;
+	}
+
+	function easeInElastic(t, b, c, d) {
+		var s=1.70158;var p=0;var a=c;
+		if (t==0) return b;  if ((t/=d)==1) return b+c;  if (!p) p=d*.3;
+		if (a < Math.abs(c)) { a=c; var s=p/4; }
+		else var s = p/(2*Math.PI) * Math.asin (c/a);
+		return -(a*Math.pow(2,10*(t-=1)) * Math.sin( (t*d-s)*(2*Math.PI)/p )) + b;
+	}
+
+	function easeOutElastic(t, b, c, d) {
+		var s=1.70158;var p=0;var a=c;
+		if (t==0) return b;  if ((t/=d)==1) return b+c;  if (!p) p=d*.3;
+		if (a < Math.abs(c)) { a=c; var s=p/4; }
+		else var s = p/(2*Math.PI) * Math.asin (c/a);
+		return a*Math.pow(2,-10*t) * Math.sin( (t*d-s)*(2*Math.PI)/p ) + c + b;
+	}
+
+	function easeInOutElastic(t, b, c, d) {
+		var s=1.70158;var p=0;var a=c;
+		if (t==0) return b;  if ((t/=d/2)==2) return b+c;  if (!p) p=d*(.3*1.5);
+		if (a < Math.abs(c)) { a=c; var s=p/4; }
+		else var s = p/(2*Math.PI) * Math.asin (c/a);
+		if (t < 1) return -.5*(a*Math.pow(2,10*(t-=1)) * Math.sin( (t*d-s)*(2*Math.PI)/p )) + b;
+		return a*Math.pow(2,-10*(t-=1)) * Math.sin( (t*d-s)*(2*Math.PI)/p )*.5 + c + b;
+	}
+
+	function easeInBack(t, b, c, d, s) {
+		if (s == undefined) s = 1.70158;
+		return c*(t/=d)*t*((s+1)*t - s) + b;
+	}
+
+	function easeOutBack(t, b, c, d, s) {
+		if (s == undefined) s = 1.70158;
+		return c*((t=t/d-1)*t*((s+1)*t + s) + 1) + b;
+	}
+
+	function easeInOutBack(t, b, c, d, s) {
+		if (s == undefined) s = 1.70158; 
+		if ((t/=d/2) < 1) return c/2*(t*t*(((s*=(1.525))+1)*t - s)) + b;
+		return c/2*((t-=2)*t*(((s*=(1.525))+1)*t + s) + 2) + b;
+	}
+
+	function easeInBounce(t, b, c, d) {
+		return c - easeOutBounce (d-t, 0, c, d) + b;
+	}
+
+	function easeOutBounce(t, b, c, d) {
+		if ((t/=d) < (1/2.75)) {
+			return c*(7.5625*t*t) + b;
+		} else if (t < (2/2.75)) {
+			return c*(7.5625*(t-=(1.5/2.75))*t + .75) + b;
+		} else if (t < (2.5/2.75)) {
+			return c*(7.5625*(t-=(2.25/2.75))*t + .9375) + b;
+		} else {
+			return c*(7.5625*(t-=(2.625/2.75))*t + .984375) + b;
+		}
+	}
+
+	function easeInOutBounce(t, b, c, d) {
+		if (t < d/2) return easeInBounce (t*2, 0, c, d) * .5 + b;
+		return easeOutBounce (t*2-d, 0, c, d) * .5 + c*.5 + b;
+	}
+
+	/** @namespace */
+	fabric.util.ease = {
+	  easeInQuad: easeInQuad,
+	  easeOutQuad: easeOutQuad,
+	  easeInOutQuad: easeInOutQuad,
+	  easeInCubic: easeInCubic,
+	  easeOutCubic: easeOutCubic,
+	  easeInOutCubic: easeInOutCubic,
+	  easeInQuart: easeInQuart,
+	  easeOutQuart: easeOutQuart,
+	  easeInOutQuart: easeInOutQuart,
+	  easeInQuint: easeInQuint,
+	  easeOutQuint: easeOutQuint,
+	  easeInOutQuint: easeInOutQuint,
+	  easeInSine: easeInSine,
+	  easeOutSine: easeOutSine,
+	  easeInOutSine: easeInOutSine,
+	  easeInExpo: easeInExpo,
+	  easeOutExpo: easeOutExpo,
+	  easeInOutExpo: easeInOutExpo,
+	  easeInCirc: easeInCirc,
+	  easeOutCirc: easeOutCirc,
+	  easeInOutCirc: easeInOutCirc,
+	  easeInElastic: easeInElastic,
+	  easeOutElastic: easeOutElastic,
+	  easeInOutElastic: easeInOutElastic,
+	  easeInBack: easeInBack,
+	  easeOutBack: easeOutBack,
+	  easeInOutBack: easeInOutBack,
+	  easeInBounce: easeInBounce,
+	  easeOutBounce: easeOutBounce,
+	  easeInOutBounce: easeInOutBounce
+	};
+
+}());
 (function() {
   
   var slice = Array.prototype.slice;
@@ -2942,6 +3140,202 @@ fabric.util.string = {
   
   fabric.util.request = request;
 })();
+(function(){
+
+	/**
+   * @namespace
+   */
+  fabric.util.ease = { };
+
+	function easeInQuad(t, b, c, d) {
+			return c*(t/=d)*t + b;
+	}
+
+	function easeOutQuad(t, b, c, d) {
+		return -c *(t/=d)*(t-2) + b;
+	}
+
+	function easeInOutQuad(t, b, c, d) {
+		if ((t/=d/2) < 1) return c/2*t*t + b;
+		return -c/2 * ((--t)*(t-2) - 1) + b;
+	}
+
+	function easeInCubic(t, b, c, d) {
+		return c*(t/=d)*t*t + b;
+	}
+
+	function easeOutCubic(t, b, c, d) {
+		return c*((t=t/d-1)*t*t + 1) + b;
+	}
+
+	function easeInOutCubic(t, b, c, d) {
+		if ((t/=d/2) < 1) return c/2*t*t*t + b;
+		return c/2*((t-=2)*t*t + 2) + b;
+	}
+
+	function easeInQuart(t, b, c, d) {
+		return c*(t/=d)*t*t*t + b;
+	}
+
+	function easeOutQuart(t, b, c, d) {
+		return -c * ((t=t/d-1)*t*t*t - 1) + b;
+	}
+
+	function easeInOutQuart(t, b, c, d) {
+		if ((t/=d/2) < 1) return c/2*t*t*t*t + b;
+		return -c/2 * ((t-=2)*t*t*t - 2) + b;
+	}
+
+	function easeInQuint(t, b, c, d) {
+		return c*(t/=d)*t*t*t*t + b;
+	}
+
+	function easeOutQuint(t, b, c, d) {
+		return c*((t=t/d-1)*t*t*t*t + 1) + b;
+	}
+
+	function easeInOutQuint(t, b, c, d) {
+		if ((t/=d/2) < 1) return c/2*t*t*t*t*t + b;
+		return c/2*((t-=2)*t*t*t*t + 2) + b;
+	}
+
+	function easeInSine(t, b, c, d) {
+		return -c * Math.cos(t/d * (Math.PI/2)) + c + b;
+	}
+
+	function easeOutSine(t, b, c, d) {
+		return c * Math.sin(t/d * (Math.PI/2)) + b;
+	}
+
+	function easeInOutSine(t, b, c, d) {
+		return -c/2 * (Math.cos(Math.PI*t/d) - 1) + b;
+	}
+
+	function easeInExpo(t, b, c, d) {
+		return (t==0) ? b : c * Math.pow(2, 10 * (t/d - 1)) + b;
+	}
+
+	function easeOutExpo(t, b, c, d) {
+		return (t==d) ? b+c : c * (-Math.pow(2, -10 * t/d) + 1) + b;
+	}
+
+	function easeInOutExpo(t, b, c, d) {
+		if (t==0) return b;
+		if (t==d) return b+c;
+		if ((t/=d/2) < 1) return c/2 * Math.pow(2, 10 * (t - 1)) + b;
+		return c/2 * (-Math.pow(2, -10 * --t) + 2) + b;
+	}
+
+	function easeInCirc(t, b, c, d) {
+		return -c * (Math.sqrt(1 - (t/=d)*t) - 1) + b;
+	}
+
+	function easeOutCirc(t, b, c, d) {
+		return c * Math.sqrt(1 - (t=t/d-1)*t) + b;
+	}
+
+	function easeInOutCirc(t, b, c, d) {
+		if ((t/=d/2) < 1) return -c/2 * (Math.sqrt(1 - t*t) - 1) + b;
+		return c/2 * (Math.sqrt(1 - (t-=2)*t) + 1) + b;
+	}
+
+	function easeInElastic(t, b, c, d) {
+		var s=1.70158;var p=0;var a=c;
+		if (t==0) return b;  if ((t/=d)==1) return b+c;  if (!p) p=d*.3;
+		if (a < Math.abs(c)) { a=c; var s=p/4; }
+		else var s = p/(2*Math.PI) * Math.asin (c/a);
+		return -(a*Math.pow(2,10*(t-=1)) * Math.sin( (t*d-s)*(2*Math.PI)/p )) + b;
+	}
+
+	function easeOutElastic(t, b, c, d) {
+		var s=1.70158;var p=0;var a=c;
+		if (t==0) return b;  if ((t/=d)==1) return b+c;  if (!p) p=d*.3;
+		if (a < Math.abs(c)) { a=c; var s=p/4; }
+		else var s = p/(2*Math.PI) * Math.asin (c/a);
+		return a*Math.pow(2,-10*t) * Math.sin( (t*d-s)*(2*Math.PI)/p ) + c + b;
+	}
+
+	function easeInOutElastic(t, b, c, d) {
+		var s=1.70158;var p=0;var a=c;
+		if (t==0) return b;  if ((t/=d/2)==2) return b+c;  if (!p) p=d*(.3*1.5);
+		if (a < Math.abs(c)) { a=c; var s=p/4; }
+		else var s = p/(2*Math.PI) * Math.asin (c/a);
+		if (t < 1) return -.5*(a*Math.pow(2,10*(t-=1)) * Math.sin( (t*d-s)*(2*Math.PI)/p )) + b;
+		return a*Math.pow(2,-10*(t-=1)) * Math.sin( (t*d-s)*(2*Math.PI)/p )*.5 + c + b;
+	}
+
+	function easeInBack(t, b, c, d, s) {
+		if (s == undefined) s = 1.70158;
+		return c*(t/=d)*t*((s+1)*t - s) + b;
+	}
+
+	function easeOutBack(t, b, c, d, s) {
+		if (s == undefined) s = 1.70158;
+		return c*((t=t/d-1)*t*((s+1)*t + s) + 1) + b;
+	}
+
+	function easeInOutBack(t, b, c, d, s) {
+		if (s == undefined) s = 1.70158; 
+		if ((t/=d/2) < 1) return c/2*(t*t*(((s*=(1.525))+1)*t - s)) + b;
+		return c/2*((t-=2)*t*(((s*=(1.525))+1)*t + s) + 2) + b;
+	}
+
+	function easeInBounce(t, b, c, d) {
+		return c - easeOutBounce (d-t, 0, c, d) + b;
+	}
+
+	function easeOutBounce(t, b, c, d) {
+		if ((t/=d) < (1/2.75)) {
+			return c*(7.5625*t*t) + b;
+		} else if (t < (2/2.75)) {
+			return c*(7.5625*(t-=(1.5/2.75))*t + .75) + b;
+		} else if (t < (2.5/2.75)) {
+			return c*(7.5625*(t-=(2.25/2.75))*t + .9375) + b;
+		} else {
+			return c*(7.5625*(t-=(2.625/2.75))*t + .984375) + b;
+		}
+	}
+
+	function easeInOutBounce(t, b, c, d) {
+		if (t < d/2) return easeInBounce (t*2, 0, c, d) * .5 + b;
+		return easeOutBounce (t*2-d, 0, c, d) * .5 + c*.5 + b;
+	}
+
+	/** @namespace */
+	fabric.util.ease = {
+	  easeInQuad: easeInQuad,
+	  easeOutQuad: easeOutQuad,
+	  easeInOutQuad: easeInOutQuad,
+	  easeInCubic: easeInCubic,
+	  easeOutCubic: easeOutCubic,
+	  easeInOutCubic: easeInOutCubic,
+	  easeInQuart: easeInQuart,
+	  easeOutQuart: easeOutQuart,
+	  easeInOutQuart: easeInOutQuart,
+	  easeInQuint: easeInQuint,
+	  easeOutQuint: easeOutQuint,
+	  easeInOutQuint: easeInOutQuint,
+	  easeInSine: easeInSine,
+	  easeOutSine: easeOutSine,
+	  easeInOutSine: easeInOutSine,
+	  easeInExpo: easeInExpo,
+	  easeOutExpo: easeOutExpo,
+	  easeInOutExpo: easeInOutExpo,
+	  easeInCirc: easeInCirc,
+	  easeOutCirc: easeOutCirc,
+	  easeInOutCirc: easeInOutCirc,
+	  easeInElastic: easeInElastic,
+	  easeOutElastic: easeOutElastic,
+	  easeInOutElastic: easeInOutElastic,
+	  easeInBack: easeInBack,
+	  easeOutBack: easeOutBack,
+	  easeInOutBack: easeInOutBack,
+	  easeInBounce: easeInBounce,
+	  easeOutBounce: easeOutBounce,
+	  easeInOutBounce: easeInOutBounce
+	};
+
+}());
 (function(global) {
 
   "use strict";
@@ -8150,6 +8544,8 @@ fabric.util.object.extend(fabric.StaticCanvas.prototype, {
       fabric.util.animate({
         startValue: options.from,
         endValue: to,
+        byValue: options.by,
+        easing: options.easing,
         duration: options.duration,
         onChange: function(value) {
           obj.set(property, value);