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

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

21 files changed, 1961 insertions, 1942 deletions

diff --git a/js/tools/BrushTool.js b/js/tools/BrushTool.js
index 8861d226..8bfec186 100644
--- a/js/tools/BrushTool.js
+++ b/js/tools/BrushTool.js
@@ -29,7 +29,7 @@ POSSIBILITY OF SUCH DAMAGE.
 </copyright> */
 
 var ShapeTool = require("js/tools/ShapeTool").ShapeTool;
-var ShapesController =  require("js/controllers/elements/shapes-controller").ShapesController;
+var ShapesController =  require("js/controllers/elements/shapes-controller").ShapesController;
 var DrawingToolBase = require("js/tools/drawing-tool-base").DrawingToolBase;
 var defaultEventManager = require("montage/core/event/event-manager").defaultEventManager;
 var Montage = require("montage/core/core").Montage;
@@ -281,7 +281,7 @@ exports.BrushTool = Montage.create(ShapeTool, {
             if (this.options.useCalligraphic){
                 useCalligraphic = this.options.useCalligraphic;
             }
-            
+
             var ctx = this.application.ninja.stage.drawingContext;//stageManagerModule.stageManager.drawingContext;
             if (ctx === null)
                 throw ("null drawing context in Brushtool::ShowCurrentBrushStrokeOnStage");
diff --git a/js/tools/EyedropperTool.js b/js/tools/EyedropperTool.js
index e9831d71..452c46d1 100755
--- a/js/tools/EyedropperTool.js
+++ b/js/tools/EyedropperTool.js
@@ -49,20 +49,20 @@ exports.EyedropperTool = Montage.create(toolBase, {
 
     Configure: {
         value: function ( doActivate )
-                {
-                        if (doActivate)
-                        {
+        {
+            if (doActivate)
+            {
                 NJevent("enableStageMove");
-                        }
-                        else
-                        {
+            }
+            else
+            {
                 NJevent("disableStageMove");
                 this._deleteImageDataCanvas();
                 this._isMouseDown = false;
                 this._elementUnderMouse = null;
                 this._previousColor = null;
                 this._color = null;
-                        }
+            }
         }
     },
 
@@ -78,7 +78,7 @@ exports.EyedropperTool = Montage.create(toolBase, {
 
     HandleMouseMove: {
         value : function (event)
-                {
+        {
             if(this._escape)
             {
                 this._isMouseDown = false;
@@ -90,12 +90,12 @@ exports.EyedropperTool = Montage.create(toolBase, {
             {
                 this._updateColorFromPoint(event);
             }
-                }
-        },
+        }
+    },
 
     HandleLeftButtonUp: {
         value : function (event) {
-                        {
+            {
                 this._isMouseDown = false;
 
                 if(this._escape)
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;
diff --git a/js/tools/InkBottleTool.js b/js/tools/InkBottleTool.js
index 3762641b..d8f06204 100755
--- a/js/tools/InkBottleTool.js
+++ b/js/tools/InkBottleTool.js
@@ -33,13 +33,13 @@ var Montage = require("montage/core/core").Montage,
     ElementsMediator = require("js/mediators/element-mediator").ElementMediator;
 
 exports.InkBottleTool = Montage.create(ModifierToolBase, {
-        _canSnap: { value: false },
-        _canColor: { value: true },
+    _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/ink.png') 6 11, default";
             var canColor = true;
@@ -72,13 +72,13 @@ exports.InkBottleTool = 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;
diff --git a/js/tools/LineTool.js b/js/tools/LineTool.js
index 89f33a16..41458d01 100755
--- a/js/tools/LineTool.js
+++ b/js/tools/LineTool.js
@@ -28,23 +28,23 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 </copyright> */
 
-var Montage =   require("montage/core/core").Montage,
+var Montage =   require("montage/core/core").Montage,
     ShapeTool = require("js/tools/ShapeTool").ShapeTool,
     DrawingToolBase = require("js/tools/drawing-tool-base").DrawingToolBase,
     NJUtils = require("js/lib/NJUtils").NJUtils,
     TagTool = require("js/tools/TagTool").TagTool,
-    ShapesController =  require("js/controllers/elements/shapes-controller").ShapesController,
+    ShapesController =  require("js/controllers/elements/shapes-controller").ShapesController,
     ShapeModel = require("js/models/shape-model").ShapeModel;
 
 var Line = require("js/lib/geom/line").Line;
 var MaterialsModel = require("js/models/materials-model").MaterialsModel;
 
 exports.LineTool = Montage.create(ShapeTool, {
-        _toolID: { value: "lineTool" },
-        _imageID: { value: "lineToolImg" },
-        _toolImageClass: { value: "lineToolUp" },
+    _toolID: { value: "lineTool" },
+    _imageID: { value: "lineToolImg" },
+    _toolImageClass: { value: "lineToolUp" },