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

diff --git a/js/document/models/text.js b/js/document/models/text.js
index acb70631..b81a2b13 100755
--- a/js/document/models/text.js
+++ b/js/document/models/text.js
@@ -30,19 +30,19 @@ POSSIBILITY OF SUCH DAMAGE.
 
 ////////////////////////////////////////////////////////////////////////
 //
-var Montage =   require("montage/core/core").Montage,
-        BaseDocumentModel = require("js/document/models/base").BaseDocumentModel;
+var Montage =   require("montage/core/core").Montage,
+    BaseDocumentModel = require("js/document/models/base").BaseDocumentModel;
 ////////////////////////////////////////////////////////////////////////
-//      
+//
 exports.TextDocumentModel = Montage.create(BaseDocumentModel, {
-        ////////////////////////////////////////////////////////////////////
-        //
-        hasTemplate: {
-                enumerable: false,
+    ////////////////////////////////////////////////////////////////////
+    //
+    hasTemplate: {
+        enumerable: false,
         value: false
     },
 ////////////////////////////////////////////////////////////////////
-        //
+    //
     save: {
         enumerable: false,
         value: function (callback) {
@@ -58,37 +58,37 @@ exports.TextDocumentModel = Montage.create(BaseDocumentModel, {
         }
     },
 ////////////////////////////////////////////////////////////////////
-        //
+    //
     handleSaved: {
-                value: function (result) {
-                        //
-                        if (result.status === 204) {
-                                this.model.needsSave = false;
-                        }
-                        //
-                        if (this.callback) this.callback(result);
-                }
-        },
+            value: function (result) {
+                //
+                if (result.status === 204) {
+                    this.model.needsSave = false;
+                }
+                //
+                if (this.callback) this.callback(result);
+            }
+        },
     ////////////////////////////////////////////////////////////////////
-        //
+        //
     close: {
             value: function (view, callback) {
-                //Outcome of close (pending on save logic)
-                var success;
-                //
-                if (this.needsSave) {
-                        //Prompt user to save of lose data
-                } else {
-                        //Close file
-                        success = true;
-                }
-                //
+                //Outcome of close (pending on save logic)
+                var success;
+                //
+                if (this.needsSave) {
+                    //Prompt user to save of lose data
+                } else {
+                    //Close file
+                    success = true;
+                }
+                //
                 this.parentContainer.removeChild(this.views.code.textViewContainer);
                 this.application.ninja.stage.restoreAllPanels();
                 this.views.code = null;
 
-                //
-                return success;
+                //
+                return success;
             }
         }
 });