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

diff --git a/js/document/views/code.js b/js/document/views/code.js
index 7df7e1c6..6648b353 100755
--- a/js/document/views/code.js
+++ b/js/document/views/code.js
@@ -30,15 +30,15 @@ POSSIBILITY OF SUCH DAMAGE.
 
 ////////////////////////////////////////////////////////////////////////
 //
-var Montage =                   require("montage/core/core").Montage,
-        Component =             require("montage/ui/component").Component,
-        BaseDocumentView =      require("js/document/views/base").BaseDocumentView;
+var Montage =           require("montage/core/core").Montage,
+    Component =         require("montage/ui/component").Component,
+    BaseDocumentView =  require("js/document/views/base").BaseDocumentView;
 ////////////////////////////////////////////////////////////////////////
 //
 exports.CodeDocumentView = Montage.create(BaseDocumentView, {
-        ////////////////////////////////////////////////////////////////////
-        //
-        hasTemplate: {
+    ////////////////////////////////////////////////////////////////////
+    //
+    hasTemplate: {
         value: false
     },
     ////////////////////////////////////////////////////////////////////
@@ -103,7 +103,7 @@ exports.CodeDocumentView = Montage.create(BaseDocumentView, {
     //Creates a new instance of a code editor
     initializeTextView: {
         value: function(file, textDocument) {
-                //
+            //
             var type;
             //
             switch(file.extension) {
@@ -146,7 +146,7 @@ exports.CodeDocumentView = Montage.create(BaseDocumentView, {
     //
     show: {
         value: function (callback) {
-                //
+            //
             this.textViewContainer.style.display = "block";
             //
             if (callback) callback();
@@ -156,7 +156,7 @@ exports.CodeDocumentView = Montage.create(BaseDocumentView, {
     //
     hide: {
         value: function (callback) {
-                //
+            //
             this.textViewContainer.style.display = "none";
             //
             if (callback) callback();