9 files changed, 286 insertions, 23 deletions

diff --git a/js/document/document-html.js b/js/document/document-html.js
index 983da966..f92a425c 100755
--- a/js/document/document-html.js
+++ b/js/document/document-html.js
@@ -125,9 +125,10 @@ exports.HtmlDocument = Montage.create(Component, {
         //
         closeDocument: {
                 value: function (context, callback) {
+                        //Closing document and getting outcome
                         var closed = this.model.close(null);
-
-            callback.call(context, this);
+                        //Making callback if specified
+                        if (callback) callback.call(context, this);
                 }
         },
     ////////////////////////////////////////////////////////////////////
@@ -139,23 +140,25 @@ exports.HtmlDocument = Montage.create(Component, {
             //this.gridVerticalSpacing = this.application.ninja.stage.drawUtils.gridVerticalSpacing;
 
             // Serialize the current scroll position
+            //TODO: Move these properties to the design view class
             this.model.scrollLeft = this.application.ninja.stage._scrollLeft;
             this.model.scrollTop = this.application.ninja.stage._scrollTop;
             this.model.userContentLeft = this.application.ninja.stage._userContentLeft;
             this.model.userContentTop = this.application.ninja.stage._userContentTop;
 
 
-            // Serialize the selection
+            // Serialize the selection, the container and grid
+            //TODO: Move this property to the design view class
             this.model.selection = this.application.ninja.selectedElements.slice(0);
+            this.model.selectionContainer = this.application.ninja.currentSelectedContainer;
             this.draw3DGrid = this.application.ninja.appModel.show3dGrid;
 
             // Serialize the undo
             // TODO: Save the montage undo queue
 
             // Pause the videos
+            //TODO: Move these to be handled on the show/hide methods in the view
             this.model.views.design.pauseVideos();
-
-            this.model.isActive = false;
         }
     },
     ////////////////////////////////////////////////////////////////////
@@ -167,18 +170,21 @@ exports.HtmlDocument = Montage.create(Component, {
             //this.application.ninja.stage.drawUtils.gridVerticalSpacing = this.gridVerticalSpacing;
 
             // Deserialize the current scroll position
+             //TODO: Move these properties to the design view class
             this.application.ninja.stage._scrollLeft = this.model.scrollLeft;
             this.application.ninja.stage._scrollTop = this.model.scrollTop;
             this.application.ninja.stage._userContentLeft = this.model.userContentLeft;
             this.application.ninja.stage._userContentTop = this.model.userContentTop;
-
+                        
+                        //TODO: Move this property to the design view class
             this.application.ninja.selectedElements = this.model.selection.slice(0);
-
+//            this.application.ninja.currentSelectedContainer = this.model.selectionContainer;
             this.application.ninja.appModel.show3dGrid = this.draw3DGrid;
 
             // Serialize the undo
             // TODO: Save the montage undo queue
-
+                        
+                        //TODO: Move this to the document controller
             this.model.isActive = true;
         }
     }
diff --git a/js/document/document-text.js b/js/document/document-text.js
index 2a469144..bb63f5f8 100755
--- a/js/document/document-text.js
+++ b/js/document/document-text.js
@@ -7,7 +7,9 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 ////////////////////////////////////////////////////////////////////////
 //
 var Montage =   require("montage/core/core").Montage,
-        Component = require("montage/ui/component").Component;
+        Component = require("montage/ui/component").Component,
+    TextDocumentModel = require("js/document/models/text").TextDocumentModel,
+    CodeDocumentView = require("js/document/views/code").CodeDocumentView;
 ////////////////////////////////////////////////////////////////////////
 //      
 exports.TextDocument = Montage.create(Component, {
@@ -16,9 +18,53 @@ exports.TextDocument = Montage.create(Component, {
         hasTemplate: {
                 enumerable: false,
         value: false
-    }
-        ////////////////////////////////////////////////////////////////////
+    },
         ////////////////////////////////////////////////////////////////////
+    //
+    model: {
+        value: null
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
+
+    init:{
+        enumerable: false,
+        value : function(file, context, callback, view){
+            var codeDocumentView = CodeDocumentView.create(), container = null;
+
+            //Creating instance of Text Document Model
+            this.model = Montage.create(TextDocumentModel,{
+                file: {value: file},
+                parentContainer: {value: document.getElementById("codeViewContainer")},
+                views: {value: {'code': codeDocumentView, 'design': null}}
+            });
+
+            codeDocumentView.initialize(this.model.parentContainer);
+
+            codeDocumentView.textArea.value = file.content;
+            codeDocumentView.initializeTextView(file, this);
+
+            if (view === 'code') {
+                //TODO: Remove reference and use as part of model
+                this.currentView = 'code';
+                //Setting current view object to design
+                this.model.currentView = this.model.views.code;
+            }
+
+
+            callback.call(context, this);
+        }
+    },
+////////////////////////////////////////////////////////////////////
+    //
+    closeDocument: {
+                value: function (context, callback) {
+                        var closed = this.model.close(null);
+
+                callback.call(context, this);
+                }
+        }
+////////////////////////////////////////////////////////////////////
 });
 ////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////
\ No newline at end of file
diff --git a/js/document/html-document.js b/js/document/html-document.js
index bcf2b5c2..447d90e3 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -209,8 +209,8 @@ exports.HTMLDocument = Montage.create(TextDocument, {
                         {
                                 /*
                                 // Use this code to test the runtime version of WebGL
-                                var cdm = new NinjaCvsRt.CanvasDataManager();
-                                cdm.loadGLData(elt,  value,  null );
+                                var cvsDataMngr = Object.create(NinjaCvsRt.CanvasDataManager, {});
+                                cvsDataMngr.loadGLData(elt, value);
                                 */
 
                                 // /*
diff --git a/js/document/models/base.js b/js/document/models/base.js
index c99e36c7..6d9d2e89 100755
--- a/js/document/models/base.js
+++ b/js/document/models/base.js
@@ -100,7 +100,7 @@ exports.BaseDocumentModel = Montage.create(Component, {
                                         }
                                         break;
                         default:
-                                        if (this.template.type === 'banner' || this.template.type === 'animation') {
+                                        if (this.template && (this.template.type === 'banner' || this.template.type === 'animation')) {
                                                 window.open('/js/document/templates/preview/banner.html?width='+this.template.size.width+'&height='+this.template.size.height+'&url='+this.url);
                                         } else {
                                                 window.open(this.url);
diff --git a/js/document/models/html.js b/js/document/models/html.js
index a97b4b5a..9cc8ce92 100755
--- a/js/document/models/html.js
+++ b/js/document/models/html.js
@@ -22,6 +22,11 @@ exports.HtmlDocumentModel = Montage.create(BaseDocumentModel, {
     selection: {
         value: []
     },
+    ////////////////////////////////////////////////////////////////////
+    //
+    selectionContainer: {
+        value: []
+    },
         ////////////////////////////////////////////////////////////////////
         //
     draw3DGrid: {
diff --git a/js/document/models/text.js b/js/document/models/text.js
index ebf9993e..d1252b7d 100755
--- a/js/document/models/text.js
+++ b/js/document/models/text.js
@@ -7,7 +7,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 ////////////////////////////////////////////////////////////////////////
 //
 var Montage =   require("montage/core/core").Montage,
-        BaseDocumentModel = require("js/document/models/text").BaseDocumentModel;
+        BaseDocumentModel = require("js/document/models/base").BaseDocumentModel;