Merge branch 'master' into gh-pages

js/model/FrameSheet.js

@@ -1,6 +1,8 @@
 (function () {
 	var ns = $.namespace("pskl.model");
-	ns.FrameSheet = function () {
+	ns.FrameSheet = function (width, height) {
+		this.width = width;
+		this.height = height;
 		this.frames = [];
 	};
 
@@ -9,7 +11,7 @@
 	};
 
 	ns.FrameSheet.prototype.addEmptyFrame = function () {
-		this.addFrame(ns.Frame.createEmpty(width, height));
+		this.addFrame(ns.Frame.createEmpty(this.width, this.height));
 	};
 
 	ns.FrameSheet.prototype.addFrame = function (frame) {

js/piskel.js

@@ -50,13 +50,11 @@ $.namespace("pskl");
   var piskel = {
 
     init : function () {
-      var emptyFrame = pskl.model.Frame.createEmpty(framePixelWidth, framePixelHeight);
-
-      frameSheet = new pskl.model.FrameSheet();
-      frameSheet.addFrame(emptyFrame);
+      frameSheet = new pskl.model.FrameSheet(framePixelWidth, framePixelHeight);
+      frameSheet.addEmptyFrame();
 
       this.drawingController = new pskl.controller.DrawingController(
-        emptyFrame,
+        frameSheet.getFrameByIndex(0),
         $('#drawing-canvas-container')[0], 
         drawingCanvasDpi
       );
@@ -193,6 +191,7 @@ $.namespace("pskl");
     },
 
     onMousedown : function (event) {
+      console.log("onMousedown");
       isClicked = true;
       
       if(event.button == 2) { // right click
@@ -211,6 +210,7 @@ $.namespace("pskl");
     },
 
     onMousemove : function (event) {
+      console.log("onMousemove");
       var currentTime = new Date().getTime();
       // Throttling of the mousemove event:
       if ((currentTime - previousMousemoveTime) > 40 ) {
@@ -233,27 +233,30 @@ $.namespace("pskl");
     },
     
     onMouseup : function (event) {
+      console.log("onMouseup");
       if(isClicked || isRightClicked) {
         // A mouse button was clicked on the drawing canvas before this mouseup event,
         // the user was probably drawing on the canvas.
         // Note: The mousemove movement (and the mouseup) may end up outside
         // of the drawing canvas.
-        // TODO: Remove that when we have the centralized redraw loop
-        this.previewsController.createPreviews();
-      }
-
-      if(isRightClicked) {
-        $.publish(Events.CANVAS_RIGHT_CLICK_RELEASED);
-      }
-      isClicked = false;
-      isRightClicked = false;
-      var spriteCoordinate = this.getSpriteCoordinate(event);
-      currentToolBehavior.releaseToolAt(
+        if(isRightClicked) {
+          $.publish(Events.CANVAS_RIGHT_CLICK_RELEASED);
+        }
+        isClicked = false;
+        isRightClicked = false;
+        var spriteCoordinate = this.getSpriteCoordinate(event);
+        currentToolBehavior.releaseToolAt(
           spriteCoordinate.col,
           spriteCoordinate.row,
           penColor,
           this.drawingController
         );
+
+        // TODO: Remove that when we have the centralized redraw loop
+        this.previewsController.createPreviews();
+      }
+
+      
     },
 
     onCanvasContextMenu : function (event) {