Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes

Conflicts:
	js/helper-classes/3D/StageLine.js

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();