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

diff --git a/js/document/models/html.js b/js/document/models/html.js
index f1f8fd78..9bf3bb4b 100755
--- a/js/document/models/html.js
+++ b/js/document/models/html.js
@@ -30,29 +30,29 @@ POSSIBILITY OF SUCH DAMAGE.
 
 ////////////////////////////////////////////////////////////////////////
 //
-var Montage =                           require("montage/core/core").Montage,
-    BaseDocumentModel =         require("js/document/models/base").BaseDocumentModel,
-    webGlDocumentHelper =       require("js/document/helpers/webgl-helper").webGlDocumentHelper;
+var Montage =               require("montage/core/core").Montage,
+    BaseDocumentModel =     require("js/document/models/base").BaseDocumentModel,
+    webGlDocumentHelper =   require("js/document/helpers/webgl-helper").webGlDocumentHelper;
 ////////////////////////////////////////////////////////////////////////
-//      
+//
 exports.HtmlDocumentModel = Montage.create(BaseDocumentModel, {
-        ////////////////////////////////////////////////////////////////////
-        //
-        hasTemplate: {
+    ////////////////////////////////////////////////////////////////////
+    //
+    hasTemplate: {
         value: false
     },
     ////////////////////////////////////////////////////////////////////
-        //Called by the document immidiately after the model is created
+    //Called by the document immidiately after the model is created
     init: {
         value:function() {
-                //Creating instance of the webGL helper for this model
-                this.webGlHelper = webGlDocumentHelper.create();
-                //
-                this.libs = {montage: false, canvas: false, montageId: null, canvasId: null};
-                }           
+            //Creating instance of the webGL helper for this model
+            this.webGlHelper = webGlDocumentHelper.create();
+            //
+            this.libs = {montage: false, canvas: false, montageId: null, canvasId: null};
+        }
     },
-        ////////////////////////////////////////////////////////////////////
-        //
+    ////////////////////////////////////////////////////////////////////
+    //
     draw3DGrid: {
         value: false
     },
@@ -77,24 +77,24 @@ exports.HtmlDocumentModel = Montage.create(BaseDocumentModel, {
         value: null
     },
     ////////////////////////////////////////////////////////////////////
-        //TODO: Convert to bindings
+    //TODO: Convert to bindings
     documentRoot: {
         get: function() {return this.views.design._documentRoot;},
         set: function(value) {this.views.design._documentRoot = value;}
     },
     ////////////////////////////////////////////////////////////////////
-        //TODO: Convert to bindings
-        baseHref: {
-                get: function() {return this.views.design._baseHref;},
+    //TODO: Convert to bindings
+    baseHref: {
+        get: function() {return this.views.design._baseHref;},
         set: function(value) {this.views.design._baseHref = value;}
-        },
+    },
     ////////////////////////////////////////////////////////////////////
-        //
-        webGlHelper: {
+    //
+    webGlHelper: {
         value: null
     }
     ////////////////////////////////////////////////////////////////////
-        ////////////////////////////////////////////////////////////////////
+    ////////////////////////////////////////////////////////////////////
 
 });
 ////////////////////////////////////////////////////////////////////////