Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes

Conflicts:
	js/helper-classes/3D/StageLine.js

1 files changed, 7 insertions, 7 deletions

diff --git a/js/tools/FillTool.js b/js/tools/FillTool.js
index d779c655..b6f244e1 100755
--- a/js/tools/FillTool.js
+++ b/js/tools/FillTool.js
@@ -40,13 +40,13 @@ var Montage = require("montage/core/core").Montage,
     ShapesController = require("js/controllers/elements/shapes-controller").ShapesController;
 
 exports.FillTool = Montage.create(ModifierToolBase, {
-        _canSnap: { value: false },
-        _canColor: { value: true },
-        _targetedElement: { value: null },
+    _canSnap: { value: false },
+    _canColor: { value: true },
+    _targetedElement: { value: null },
 
     HandleMouseMove: {
         value : function (event)
-                {
+        {
             var obj = this.application.ninja.stage.getElement(event, true);
             var cursor = "url('images/cursors/fill.png') 14 14, default";
             var canColor = true;
@@ -78,13 +78,13 @@ exports.FillTool = Montage.create(ModifierToolBase, {
             }
             this.application.ninja.stage.drawingCanvas.style.cursor = cursor;
             this._canColor = canColor;
-                }
-        },
+        }
+    },
 
     HandleLeftButtonUp: {
         value : function () {
             //if(this._isDrawing)
-                        {
+            {
                 this.application.ninja.stage.clearDrawingCanvas();
                 this._hasDraw = false;
                 this._isDrawing = false;