Merge branch 'normalize' of https://github.com/kriskowal/ninja-internal

Conflicts:
	js/components/gradientpicker.reel/gradientpicker.js
	js/components/tools-properties/text-properties.reel/text-properties.js
	js/document/views/base.js
	js/document/views/design.js
	js/helper-classes/3D/StageLine.js
	js/helper-classes/3D/draw-utils.js
	js/lib/drawing/world.js
	js/lib/geom/circle.js
	js/lib/geom/line.js
	js/lib/geom/rectangle.js
	js/lib/geom/shape-primitive.js
	js/lib/rdge/materials/bump-metal-material.js
	js/lib/rdge/materials/flag-material.js
	js/lib/rdge/materials/fly-material.js
	js/lib/rdge/materials/julia-material.js
	js/lib/rdge/materials/keleidoscope-material.js
	js/lib/rdge/materials/mandel-material.js
	js/lib/rdge/materials/material.js
	js/lib/rdge/materials/plasma-material.js
	js/lib/rdge/materials/pulse-material.js
	js/lib/rdge/materials/radial-gradient-material.js
	js/lib/rdge/materials/taper-material.js
	js/lib/rdge/materials/twist-vert-material.js
	js/lib/rdge/materials/water-material.js
	js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
	js/panels/Materials/materials-library-panel.reel/materials-library-panel.js
	js/panels/Materials/materials-popup.reel/materials-popup.html
	js/panels/Materials/materials-popup.reel/materials-popup.js
	js/tools/LineTool.js

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

1 files changed, 215 insertions, 215 deletions

diff --git a/js/tools/Translate3DToolBase.js b/js/tools/Translate3DToolBase.js
index 00408b6e..3e6f2ac6 100755
--- a/js/tools/Translate3DToolBase.js
+++ b/js/tools/Translate3DToolBase.js
@@ -41,16 +41,16 @@ var Montage = require("montage/core/core").Montage,
 
 exports.Translate3DToolBase = Montage.create(ModifierToolBase,
 {
-        _inLocalMode: { value: true, enumerable: true },
-        _clickedOnStage: { value: false },
+    _inLocalMode: { value: true, enumerable: true },
+    _clickedOnStage: { value: false },
 
-        HandleDoubleClick : {
-           value : function() {
-           }
-        },
+    HandleDoubleClick : {
+       value : function() {
+       }
+    },
 
     modifyElements : {
-                value : function(data, event)
+        value : function(data, event)
         {
             //console.log( "modifyElements, data: " + data.pt0 + " => " + data.pt1 );
 
@@ -94,7 +94,7 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase,
                 this._delta = delta.slice(0);
             }
 
-                        //console.log( "modifyElements delta: " + delta );
+            //console.log( "modifyElements delta: " + delta );
             var transMat = Matrix.Translation( delta );
 
             //console.log( "Translate: " + delta );
@@ -107,11 +107,11 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase,
                 this._translateGlobally(transMat);
             }
         }
-        },
+    },
 
 
-        Reset: {
-                value: function() {
+    Reset: {
+        value: function() {
             var mat, iMat, dist, mod3dObject = [], self = this;
 
             this.application.ninja.selectedElements.forEach(function(element) {
@@ -133,60 +133,60 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase,
 
             ElementsMediator.set3DProperties(mod3dObject, "Change", "rotateTool");
 
-                        this.isDrawing = false;
+            this.isDrawing = false;
             this.endDraw(event);
 
             // Need to force stage to draw immediately so the new selection center is calculated
             this.application.ninja.stage.draw();
             // And captureSelectionDrawn to draw the transform handles
             this.captureSelectionDrawn(null);
-                }
-        },
+        }
+    },
 
-        // We will only translate single elements locally
-        _translateLocally: {
-                value: function (transMat) {
+    // We will only translate single elements locally
+    _translateLocally: {
+        value: function (transMat) {
             //console.log( "_translateLocally, startMat: " + this._startMat );
             //console.log( "_translateLocally, transMat: " + transMat );
             //console.log( "_translateLocally, startMat: " + this._startMat + ", transMat: " + transMat );
-                        var mat = glmat4.multiply(this._startMat, transMat, []);
-                        viewUtils.setMatrixForElement( this._target, mat, true );
-                        if(this._mode !== 1)
-                        {
-                                this._startMat = mat;
-                        }
-                }
-        },
-
-        _translateGlobally: {
-                value: function (transMat) {
+            var mat = glmat4.multiply(this._startMat, transMat, []);
+            viewUtils.setMatrixForElement( this._target, mat, true );
+            if(this._mode !== 1)
+            {
+                this._startMat = mat;
+            }
+        }
+    },
+
+    _translateGlobally: {
+        value: function (transMat) {
             //console.log( "_translateGlobally, transMat: " + transMat );
-                        var selectedElements = this.application.ninja.selectedElements;
+            var selectedElements = this.application.ninja.selectedElements;
 
             var len = selectedElements.length,
                 self = this,
-                                target = selectedElements[0],
-                                curMat = viewUtils.getMatrixFromElement( target ),
+                target = selectedElements[0],
+                curMat = viewUtils.getMatrixFromElement( target ),
                 matInv = glmat4.inverse(this._startMat, []),
                 nMat = glmat4.multiply(transMat, this._startMat, [] );
-//                          qMat = glmat4.multiply(matInv, nMat, []);
-           
+//              qMat = glmat4.multiply(matInv, nMat, []);
+
             if(this._mode === 1) {
-                                if (len > 1)  curMat = target.elementModel.getProperty("mat").slice();
+                if (len > 1)  curMat = target.elementModel.getProperty("mat").slice();
                 var curInv = glmat4.inverse( curMat, [] );
                 transMat = glmat4.multiply( nMat, curInv, [] );
             }
 
-                        var shouldUpdateStartMat = true;
+            var shouldUpdateStartMat = true;
 
-                        if(this._clickedOnStage || ((this._handleMode === 2) && (len > 1)))
-                        {
-                                shouldUpdateStartMat = false;
-                        }
-                        else if(this._mode !== 1)
-                        {
-                                this._startMat = nMat;
-                        }
+            if(this._clickedOnStage || ((this._handleMode === 2) && (len > 1)))
+            {
+                shouldUpdateStartMat = false;
+            }
+            else if(this._mode !== 1)
+            {
+                this._startMat = nMat;
+            }
 
             selectedElements.forEach(function(element) {
                 curMat = element.elementModel.getProperty("mat").slice(0);
@@ -205,11 +205,11 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase,
                 }
 
             });
-                }
-        },
+        }
+    },
 
     _updateTargets: {
-                value: function(addToUndo) {
+        value: function(addToUndo) {
             var mod3dObject = [], self = this;
 
             this.application.ninja.selectedElements.forEach(function(element) {
@@ -223,7 +223,7 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase,
                 }
             });
 
-                        if(addToUndo) {
+            if(addToUndo) {
                 ElementsMediator.set3DProperties(mod3dObject, "Change", "translateTool");
 
                 if(this._origin && this._delta) {
@@ -243,54 +243,54 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase,
                 element.elementModel.setProperty("dist", viewUtils.getPerspectiveDistFromElement(element));
             });
 
-                }
-        },
-
-        HandleAltKeyDown: {
-                value: function(event) {
-                        this._inLocalMode = !this._inLocalMode;
-                        this.DrawHandles();
-                }
-        },
-
-        HandleAltKeyUp: {
-                value: function(event) {
-                        this._inLocalMode = !this._inLocalMode;
-                        this.DrawHandles();
-                }
-        },
-
-        handleScroll: {
-                value: function(event) {
-                        this.captureSelectionDrawn(null);
-                }
-        },
-
-        _updateHandlesOrigin: {
+        }
+    },
+
+    HandleAltKeyDown: {
+        value: function(event) {
+            this._inLocalMode = !this._inLocalMode;
+            this.DrawHandles();
+        }
+    },
+
+    HandleAltKeyUp: {
+        value: function(event) {
+            this._inLocalMode = !this._inLocalMode;
+            this.DrawHandles();
+        }
+    },
+
+    handleScroll: {
+        value: function(event) {
+            this.captureSelectionDrawn(null);
+        }
+    },
+
+    _updateHandlesOrigin: {