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, 14 insertions, 14 deletions

diff --git a/js/tools/LineTool.js b/js/tools/LineTool.js
index d2ee0b43..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" },
-        _selectedToolImageClass: { value: "lineToolDown" },
-        _toolTipText: { value: "Line Tool (L)" },
+    _toolID: { value: "lineTool" },
+    _imageID: { value: "lineToolImg" },
+    _toolImageClass: { value: "lineToolUp" },
+    _selectedToolImageClass: { value: "lineToolDown" },
+    _toolTipText: { value: "Line Tool (L)" },
 
     _tmpDrawIndex : { value : 1, writable:true},
 
@@ -173,10 +173,10 @@ exports.LineTool = Montage.create(ShapeTool, {
                 slope,
                 dx,
                 dy;
-            
-                        if (hitRec0 && hitRec1) {
-                                var p0 = hitRec0.getLocalPoint(),
-                                        p1 = hitRec1.getLocalPoint();
+
+            if (hitRec0 && hitRec1) {
+                var p0 = hitRec0.getLocalPoint(),
+                    p1 = hitRec1.getLocalPoint();
 
                 dx = Math.floor(p0[0] - p1[0]);
                 dy = Math.floor(p0[1] - p1[1]);
@@ -246,7 +246,7 @@ exports.LineTool = Montage.create(ShapeTool, {
     },
 
     RenderShape: {
-                value: function (w, h, planeMat, midPt, canvas, slope, xAdj, yAdj)
+        value: function (w, h, planeMat, midPt, canvas, slope, xAdj, yAdj)
         {
 
             var strokeStyleIndex = this.options.strokeStyleIndex;
@@ -271,8 +271,8 @@ exports.LineTool = Montage.create(ShapeTool, {
                 if (strokeMaterial && this.options.stroke.color && (strokeMaterial.gradientType === this.options.stroke.color.gradientMode)) {
                     strokeColor = {gradientMode:strokeMaterial.gradientType, color:this.options.stroke.color.stops};
                 } else {
-                    strokeColor = ShapesController.getMaterialColor(strokeM) || strokeColor;
-                }
+                strokeColor = ShapesController.getMaterialColor(strokeM) || strokeColor;
+            }
             }
 
             var world = this.getGLWorld(canvas, this.options.use3D);