Merge branch 'dom-architecture' of github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates

Conflicts:
	js/controllers/styles-controller.js

3 files changed, 59 insertions, 5 deletions

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;
 ////////////////////////////////////////////////////////////////////////
 //      
 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