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

diff --git a/js/components/layout/document-bar.reel/document-bar.js b/js/components/layout/document-bar.reel/document-bar.js
index 86c55267..890640b1 100755
--- a/js/components/layout/document-bar.reel/document-bar.js
+++ b/js/components/layout/document-bar.reel/document-bar.js
@@ -127,21 +127,21 @@ exports.DocumentBar = Montage.create(Component, {
         value: 100
     },
 
-        zoomFactor: {
-                get: function() { return this._zoomFactor; },
-
-                set: function(value)
-                {
-                        if(value !== this._zoomFactor)
-                        {
-                                this._zoomFactor = value;
-                                if (!this._firstDraw)
-                                {
-                                        this.application.ninja.stage.setZoom(value);
-                                }
-                        }
-                }
-        },
+    zoomFactor: {
+        get: function() { return this._zoomFactor; },
+
+        set: function(value)
+        {
+            if(value !== this._zoomFactor)
+            {
+                this._zoomFactor = value;
+                if (!this._firstDraw)
+                {
+                    this.application.ninja.stage.setZoom(value);
+                }
+            }
+        }
+    },
 
     draw: {
         value: function() {
@@ -157,7 +157,7 @@ exports.DocumentBar = Montage.create(Component, {
                     this.codeView.classList.add("selected");
                     if(this.designView.classList.contains("selected")) this.designView.classList.toggle("selected");
                 }
-                
+
             } else if(this.type) {
                 this.designView.classList.remove("active");
             }