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

diff --git a/js/document/document-text.js b/js/document/document-text.js
index fd01b2e6..3ffa8263 100755
--- a/js/document/document-text.js
+++ b/js/document/document-text.js
@@ -30,19 +30,19 @@ POSSIBILITY OF SUCH DAMAGE.
 
 ////////////////////////////////////////////////////////////////////////
 //
-var Montage =                   require("montage/core/core").Montage,
-        Component =             require("montage/ui/component").Component,
+var Montage =           require("montage/core/core").Montage,
+    Component =         require("montage/ui/component").Component,
     TextDocumentModel = require("js/document/models/text").TextDocumentModel,
-    CodeDocumentView =  require("js/document/views/code").CodeDocumentView;
+    CodeDocumentView =  require("js/document/views/code").CodeDocumentView;
 ////////////////////////////////////////////////////////////////////////
-//      
+//
 exports.TextDocument = Montage.create(Component, {
-        ////////////////////////////////////////////////////////////////////
-        //
-        hasTemplate: {
+    ////////////////////////////////////////////////////////////////////
+    //
+    hasTemplate: {
         value: false
     },
-        ////////////////////////////////////////////////////////////////////
+    ////////////////////////////////////////////////////////////////////
     //
     model: {
         value: null
@@ -51,7 +51,7 @@ exports.TextDocument = Montage.create(Component, {
     //
     init:{
         value: function(file, context, callback, view){
-                //
+            //
             var codeDocumentView = CodeDocumentView.create(), container = null; //TODO: Why is this initilzied to null?
             //Creating instance of Text Document Model
             this.model = Montage.create(TextDocumentModel,{
@@ -72,22 +72,22 @@ exports.TextDocument = Montage.create(Component, {
                 codeDocumentView.textArea.value = file.content;
                 codeDocumentView.initializeTextView(file, this);
             } else {
-                    //Other view(s) logic goes here
+                //Other view(s) logic goes here
             }
             //Checking if callback is needed
             if (callback) callback.call(context, this);
         }
     },
     ////////////////////////////////////////////////////////////////////
-        //
-        closeDocument: {
-                value: function (context, callback) {
-                        //Closing document and getting outcome
-                        var closed = this.model.close(null);
-                        //Making callback if specified
-                        if (callback) callback.call(context, this);
-                }
-        }
+    //
+    closeDocument: {
+        value: function (context, callback) {
+            //Closing document and getting outcome
+            var closed = this.model.close(null);
+            //Making callback if specified
+            if (callback) callback.call(context, this);
+        }
+    }
     ////////////////////////////////////////////////////////////////////
     ////////////////////////////////////////////////////////////////////
 });