Dev environment:force indentation to 2 spaces. Added new grunt module, grunt-leading-indent to check space consistency, and modified jshint options to enforce 2 spaces

js/controller/DrawingController.js

@@ -68,21 +68,21 @@
 
   ns.DrawingController.prototype.initMouseBehavior = function() {
     var body = $('body');
-        this.container.mousedown($.proxy(this.onMousedown_, this));
-        this.container.mousemove($.proxy(this.onMousemove_, this));
-        body.mouseup($.proxy(this.onMouseup_, this));
-        
-        // Deactivate right click:
-        body.contextmenu(this.onCanvasContextMenu_);
+    this.container.mousedown($.proxy(this.onMousedown_, this));
+    this.container.mousemove($.proxy(this.onMousemove_, this));
+    body.mouseup($.proxy(this.onMouseup_, this));
+    
+    // Deactivate right click:
+    body.contextmenu(this.onCanvasContextMenu_);
   };
 
 
 
   ns.DrawingController.prototype.startDPIUpdateTimer_ = function () {
-      if (this.dpiUpdateTimer) {
-        window.clearInterval(this.dpiUpdateTimer);
-      }
-      this.dpiUpdateTimer = window.setTimeout($.proxy(this.updateDPI_, this), 200);
+    if (this.dpiUpdateTimer) {
+      window.clearInterval(this.dpiUpdateTimer);
+    }
+    this.dpiUpdateTimer = window.setTimeout($.proxy(this.updateDPI_, this), 200);
   },
 
   /**
@@ -98,144 +98,144 @@
    * @private
    */
   ns.DrawingController.prototype.onMousedown_ = function (event) {
-      this.isClicked = true;
-      
-      if(event.button == 2) { // right click
-        this.isRightClicked = true;
-        $.publish(Events.CANVAS_RIGHT_CLICKED);
-      }
+    this.isClicked = true;
+    
+    if(event.button == 2) { // right click
+      this.isRightClicked = true;
+      $.publish(Events.CANVAS_RIGHT_CLICKED);
+    }
 
-      var coords = this.getSpriteCoordinates(event);
+    var coords = this.getSpriteCoordinates(event);
+    
+    this.currentToolBehavior.applyToolAt(
+      coords.col, coords.row,
+      this.getCurrentColor_(),
+      this.framesheet.getCurrentFrame(),
+      this.overlayFrame,
+      this.wrapEvtInfo_(event)
+    );      
       
-      this.currentToolBehavior.applyToolAt(
-        coords.col, coords.row,
-        this.getCurrentColor_(),
-        this.framesheet.getCurrentFrame(),
-        this.overlayFrame,
-        this.wrapEvtInfo_(event)
-      );      
-        
-      $.publish(Events.LOCALSTORAGE_REQUEST);
-    };
+    $.publish(Events.LOCALSTORAGE_REQUEST);
+  };
 
-    /**
+  /**
    * @private
    */
-    ns.DrawingController.prototype.onMousemove_ = function (event) {
-      var currentTime = new Date().getTime();
-      // Throttling of the mousemove event:
-      if ((currentTime - this.previousMousemoveTime) > 40 ) {
-        var coords = this.getSpriteCoordinates(event);
-        if (this.isClicked) {
-       
-          this.currentToolBehavior.moveToolAt(
-            coords.col, coords.row,
-            this.getCurrentColor_(),
-            this.framesheet.getCurrentFrame(),
-            this.overlayFrame,
-            this.wrapEvtInfo_(event)
-          );
-      
-          // TODO(vincz): Find a way to move that to the model instead of being at the interaction level.
-          // Eg when drawing, it may make sense to have it here. However for a non drawing tool,
-          // you don't need to draw anything when mousemoving and you request useless localStorage.
-          $.publish(Events.LOCALSTORAGE_REQUEST);
-        } else {
-
-          this.currentToolBehavior.moveUnactiveToolAt(
-            coords.col, coords.row,
-            this.getCurrentColor_(),
-            this.framesheet.getCurrentFrame(),
-            this.overlayFrame,
-            this.wrapEvtInfo_(event)
-          );
-        }
-        this.previousMousemoveTime = currentTime;
-      }
-    };
-
-    /**
-     * @private
-     */
-    ns.DrawingController.prototype.onMouseup_ = function (event) {
-      if(this.isClicked || this.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.
-
-        this.isClicked = false;
-        this.isRightClicked = false;
-
-        var coords = this.getSpriteCoordinates(event);
-        //console.log("mousemove: col: " + spriteCoordinate.col + " - row: " + spriteCoordinate.row);
-        this.currentToolBehavior.releaseToolAt(
+  ns.DrawingController.prototype.onMousemove_ = function (event) {
+    var currentTime = new Date().getTime();
+    // Throttling of the mousemove event:
+    if ((currentTime - this.previousMousemoveTime) > 40 ) {
+      var coords = this.getSpriteCoordinates(event);
+      if (this.isClicked) {
+     
+        this.currentToolBehavior.moveToolAt(
           coords.col, coords.row,
           this.getCurrentColor_(),
           this.framesheet.getCurrentFrame(),
           this.overlayFrame,
           this.wrapEvtInfo_(event)
         );
-
-        $.publish(Events.TOOL_RELEASED);
-      }
-    },
-
-    /**
-     * @private
-     */
-    ns.DrawingController.prototype.wrapEvtInfo_ = function (event) {
-      var evtInfo = {};
-      if (event.button === 0) {
-        evtInfo.button = Constants.LEFT_BUTTON;
-      } else if (event.button == 2) {
-        evtInfo.button = Constants.RIGHT_BUTTON;
-      }
-      return evtInfo;
-    },    
-
-    /**
-     * @private
-     */
-    ns.DrawingController.prototype.getRelativeCoordinates = function (clientX, clientY) {
-      var canvasPageOffset = this.container.offset();
-      return {
-        x : clientX - canvasPageOffset.left,
-        y : clientY - canvasPageOffset.top
-      };
-    };
-
-    /**
-     * @private
-     */
-    ns.DrawingController.prototype.getSpriteCoordinates = function(event) {
-        var coords = this.getRelativeCoordinates(event.clientX, event.clientY);
-        return this.renderer.convertPixelCoordinatesIntoSpriteCoordinate(coords);
-    };
-
-    /**
-     * @private
-     */
-    ns.DrawingController.prototype.getCurrentColor_ = function () {
-      if(this.isRightClicked) {
-        return this.secondaryColor;
+    
+        // TODO(vincz): Find a way to move that to the model instead of being at the interaction level.
+        // Eg when drawing, it may make sense to have it here. However for a non drawing tool,
+        // you don't need to draw anything when mousemoving and you request useless localStorage.
+        $.publish(Events.LOCALSTORAGE_REQUEST);
       } else {
-        return this.primaryColor;
-      }
-    };
 
-    /**
-     * @private
-     */
-    ns.DrawingController.prototype.onCanvasContextMenu_ = function (event) {
-      if ($(event.target).closest('#drawing-canvas-container').length) {
-        // Deactivate right click on drawing canvas only.
-        event.preventDefault();
-        event.stopPropagation();
-        event.cancelBubble = true;
-        return false;
-      }   
+        this.currentToolBehavior.moveUnactiveToolAt(
+          coords.col, coords.row,
+          this.getCurrentColor_(),
+          this.framesheet.getCurrentFrame(),
+          this.overlayFrame,
+          this.wrapEvtInfo_(event)
+        );
+      }
+      this.previousMousemoveTime = currentTime;
+    }
+  };
+
+  /**
+   * @private
+   */
+  ns.DrawingController.prototype.onMouseup_ = function (event) {
+    if(this.isClicked || this.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.
+
+      this.isClicked = false;
+      this.isRightClicked = false;
+
+      var coords = this.getSpriteCoordinates(event);
+      //console.log("mousemove: col: " + spriteCoordinate.col + " - row: " + spriteCoordinate.row);
+      this.currentToolBehavior.releaseToolAt(
+        coords.col, coords.row,
+        this.getCurrentColor_(),
+        this.framesheet.getCurrentFrame(),
+        this.overlayFrame,
+        this.wrapEvtInfo_(event)
+      );
+
+      $.publish(Events.TOOL_RELEASED);
+    }
+  };
+
+  /**
+   * @private
+   */
+  ns.DrawingController.prototype.wrapEvtInfo_ = function (event) {
+    var evtInfo = {};
+    if (event.button === 0) {
+      evtInfo.button = Constants.LEFT_BUTTON;
+    } else if (event.button == 2) {
+      evtInfo.button = Constants.RIGHT_BUTTON;
+    }
+    return evtInfo;
+  }; 
+
+  /**
+   * @private
+   */
+  ns.DrawingController.prototype.getRelativeCoordinates = function (clientX, clientY) {
+    var canvasPageOffset = this.container.offset();
+    return {
+      x : clientX - canvasPageOffset.left,
+      y : clientY - canvasPageOffset.top
     };
+  };
+
+  /**
+   * @private
+   */
+  ns.DrawingController.prototype.getSpriteCoordinates = function(event) {
+    var coords = this.getRelativeCoordinates(event.clientX, event.clientY);
+    return this.renderer.convertPixelCoordinatesIntoSpriteCoordinate(coords);
+  };
+
+  /**
+   * @private
+   */
+  ns.DrawingController.prototype.getCurrentColor_ = function () {
+    if(this.isRightClicked) {
+      return this.secondaryColor;
+    } else {
+      return this.primaryColor;
+    }
+  };
+
+  /**
+   * @private
+   */
+  ns.DrawingController.prototype.onCanvasContextMenu_ = function (event) {
+    if ($(event.target).closest('#drawing-canvas-container').length) {
+      // Deactivate right click on drawing canvas only.
+      event.preventDefault();
+      event.stopPropagation();
+      event.cancelBubble = true;
+      return false;
+    }   
+  };
 
   ns.DrawingController.prototype.render = function () {
     this.renderFrame();
@@ -271,11 +271,11 @@
    */
   ns.DrawingController.prototype.calculateDPI_ = function() {
     var availableViewportHeight = $('#main-wrapper').height(),
-        leftSectionWidth = $('.left-column').outerWidth(true),
-        rightSectionWidth = $('.right-column').outerWidth(true),
-        availableViewportWidth = $('#main-wrapper').width() - leftSectionWidth - rightSectionWidth,
-        framePixelHeight = this.framesheet.getCurrentFrame().getHeight(),
-        framePixelWidth = this.framesheet.getCurrentFrame().getWidth();
+      leftSectionWidth = $('.left-column').outerWidth(true),
+      rightSectionWidth = $('.right-column').outerWidth(true),
+      availableViewportWidth = $('#main-wrapper').width() - leftSectionWidth - rightSectionWidth,
+      framePixelHeight = this.framesheet.getCurrentFrame().getHeight(),
+      framePixelWidth = this.framesheet.getCurrentFrame().getWidth();
 
     if (pskl.UserSettings.get(pskl.UserSettings.SHOW_GRID)) {
       availableViewportWidth = availableViewportWidth - (framePixelWidth * Constants.GRID_STROKE_WIDTH);
@@ -299,7 +299,7 @@
     var currentFrameHeight =  this.framesheet.getCurrentFrame().getHeight();
     var canvasHeight = currentFrameHeight * dpi;
     if (pskl.UserSettings.get(pskl.UserSettings.SHOW_GRID)) {
-        canvasHeight += Constants.GRID_STROKE_WIDTH * currentFrameHeight;
+      canvasHeight += Constants.GRID_STROKE_WIDTH * currentFrameHeight;
     }
     
     var verticalGapInPixel = Math.floor(($('#main-wrapper').height() - canvasHeight) / 2);