Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document

Conflicts:
	js/document/document-html.js

5 files changed, 253 insertions, 13 deletions

diff --git a/js/document/document-html.js b/js/document/document-html.js
index ae5b73b6..d6b4ba95 100755
--- a/js/document/document-html.js
+++ b/js/document/document-html.js
@@ -158,9 +158,6 @@ exports.HtmlDocument = Montage.create(Component, {
             // Pause the videos
             //TODO: Move these to be handled on the show/hide methods in the view
             this.model.views.design.pauseVideos();
-                        
-                        //TODO: Move this to the document controller
-            this.model.isActive = false;
         }
     },
     ////////////////////////////////////////////////////////////////////
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/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;
 ////////////////////////////////////////////////////////////////////////
 //      
 exports.TextDocumentModel = Montage.create(BaseDocumentModel, {
@@ -16,9 +16,58 @@ exports.TextDocumentModel = Montage.create(BaseDocumentModel, {
         hasTemplate: {
                 enumerable: false,
         value: false
-    }
-        ////////////////////////////////////////////////////////////////////
-        ////////////////////////////////////////////////////////////////////
+    },
+////////////////////////////////////////////////////////////////////
+        //
+    save: {
+        enumerable: false,
+        value: function (callback) {
+            this.application.ninja.documentController.activeDocument.model.views.code.editor.save();//save to textarea
+
+            var self = this;
+
+            this.application.ninja.ioMediator.fileSave({
+                mode: ""+ self.file.extension,
+                file: self.file,
+                content:self.views.code.textArea.value
+            }, this.handleSaved.bind({callback: callback, model: this}));
+        }
+    },
+////////////////////////////////////////////////////////////////////
+        //
+    handleSaved: {
+                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;
+                }
+                //
+                this.parentContainer.removeChild(this.views.code.textViewContainer);
+                this.application.ninja.stage.showCodeViewBar(false);
+                this.application.ninja.stage.restoreAllPanels();
+                this.views.code = null;
+
+                //
+                return success;
+            }
+        }
 });
 ////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////
\ No newline at end of file
diff --git a/js/document/views/base.js b/js/document/views/base.js
index d1c65b5e..db72cc60 100755
--- a/js/document/views/base.js
+++ b/js/document/views/base.js
@@ -39,6 +39,7 @@ exports.BaseDocumentView = Montage.create(Component, {
         value: function (callback) {
                 if (this.iframe) {
                         this.iframe.style.display = 'block';
+                this.iframe.style.opacity = 1;
                 } else {
                         console.log('Error: View has no iframe to show!');
                 }
@@ -52,6 +53,7 @@ exports.BaseDocumentView = Montage.create(Component, {
         value: function (callback) {
                 if (this.iframe) {
                         this.iframe.style.display = 'none';
+                this.iframe.style.opacity = 0;
                 } else {
                         console.log('Error: View has no iframe to hide!');
                 }
diff --git a/js/document/views/code.js b/js/document/views/code.js
index cd3e02d4..66d1c702 100755
--- a/js/document/views/code.js
+++ b/js/document/views/code.js
@@ -11,15 +11,161 @@ var Montage = 			require("montage/core/core").Montage,
         BaseDocumentView =      require("js/document/views/base").BaseDocumentView;
 ////////////////////////////////////////////////////////////////////////
 //      
-exports.CodeDocumentView = Montage.create(BaseDocumentView, {
+var CodeDocumentView = exports.CodeDocumentView = Montage.create(BaseDocumentView, {
         ////////////////////////////////////////////////////////////////////
         //
         hasTemplate: {
                 enumerable: false,
         value: false
+    },
+
+    ////////////////////////////////////////////////////////////////////
+    //
+    _editor: {
+        value: null
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
+    editor: {
+        get: function() {return this._editor;},
+        set: function(value) {this._editor= value;}
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
+    _textArea: {
+        value: null
+    },
+    ////////////////////////////////////////////////////////////////////