Shit merge

js/Constants.js

@@ -1,5 +1,6 @@
 var Constants = {
-	DEFAULT_PEN_COLOR : "#000000",
-    TRANSPARENT_COLOR : "TRANSPARENT",
-    PISKEL_SERVICE_URL : "http://2.piskel-app.appspot.com"
+
+	DEFAULT_PEN_COLOR : '#000000',
+	TRANSPARENT_COLOR : "TRANSPARENT",
+	PISKEL_SERVICE_URL: 'http://2.piskel-app.appspot.com'
 };

js/Events.js

@@ -20,7 +20,7 @@ Events = {
 	 * TODO: Remove or rework when redraw system is refactored.
 	 */
 	REFRESH: "REFRESH",
+	
 	SHOW_NOTIFICATION: "SHOW_NOTIFICATION",
 	HIDE_NOTIFICATION: "HIDE_NOTIFICATION"
-
 };

js/drawingtools/Eraser.js

@@ -20,7 +20,7 @@
 		
 		// Change model:
 		frame[col][row] = Constants.TRANSPARENT_COLOR;
-
+		
 		// Draw on canvas:
 		// TODO: Remove that when we have the centralized redraw loop
 		this.drawPixelInCanvas(col, row, canvas, Constants.TRANSPARENT_COLOR, dpi);
@@ -33,4 +33,9 @@
 		this.applyToolAt(col, row, frame, color, canvas, dpi);
 	};
 
+	ns.Eraser.prototype.releaseToolAt = function(col, row, frame, color, canvas, dpi) {
+		// TODO: Create a afterRelease event hook or put that deep in the model
+		$.publish(Events.FRAMESHEET_UPDATED);   
+	};
+
 })();

js/drawingtools/PaintBucket.js

@@ -21,12 +21,18 @@
 		var targetColor = pskl.utils.normalizeColor(frame[col][row]);
 		//this.recursiveFloodFill_(frame, col, row, targetColor, color);
 		this.queueLinearFloodFill_(frame, col, row, targetColor, color);
-
+		$.publish(Events.FRAMESHEET_UPDATED);
+        
 		// Draw in canvas:
 		// TODO: Remove that when we have the centralized redraw loop
 		this.drawFrameInCanvas(frame, canvas, dpi);
 	};
 
+	ns.PaintBucket.prototype.releaseToolAt = function(col, row, frame, color, canvas, dpi) {
+		// TODO: Create a afterRelease event hook or put that deep in the model
+		$.publish(Events.FRAMESHEET_UPDATED);   
+	};
+	
 	/**
 	 *  Flood-fill (node, target-color, replacement-color):
 	 *	 1. Set Q to the empty queue.

js/drawingtools/Rectangle.js

@@ -81,9 +81,12 @@
 			// TODO: Remove that when we have the centralized redraw loop
 			this.drawPixelInCanvas(strokePoints[i].col, strokePoints[i].row, canvas, color, dpi);		
 		}
-
+		
 		// For now, we are done with the stroke tool and don't need an overlay anymore:
 		this.removeCanvasOverlays();
+
+		// TODO: Create a afterRelease event hook or put that deep in the model
+		$.publish(Events.FRAMESHEET_UPDATED);   
 	};
 
 	/**

js/drawingtools/SimplePen.js

@@ -52,4 +52,9 @@
 		this.previousCol = col;
 		this.previousRow = row;
 	};
+
+	ns.SimplePen.prototype.releaseToolAt = function(col, row, frame, color, canvas, dpi) {
+		// TODO: Create a afterRelease event hook or out that deep in the model
+		$.publish(Events.FRAMESHEET_UPDATED);   
+	};
 })();

js/drawingtools/Stroke.js

@@ -97,6 +97,9 @@
 
 		// For now, we are done with the stroke tool and don't need an overlay anymore:
 		this.removeCanvasOverlays();
+
+		// TODO: Create a afterRelease event hook or out that deep in the model
+		$.publish(Events.FRAMESHEET_UPDATED);     
 	};
 
 })();

js/piskel.js

@@ -95,8 +95,7 @@ $.namespace("pskl");
 
       // TODO: Move this into their service or behavior files:
       this.initDrawingArea();
-      this.initPreviewSlideshow();
-      this.initAnimationPreview();
+      this.initPreviewSlideshow();   
       this.startAnimation();
       
       pskl.ToolSelector.init();