Merge branch 'refs/heads/dom-architecture' into binding

Conflicts:
	js/data/panels-data.js

Signed-off-by: Armen Kesablyan <armen@motorola.com>

3 files changed, 92 insertions, 9 deletions

diff --git a/js/document/models/base.js b/js/document/models/base.js
index 649539ea..6d9d2e89 100755
--- a/js/document/models/base.js
+++ b/js/document/models/base.js
@@ -30,7 +30,7 @@ exports.BaseDocumentModel = Montage.create(Component, {
         ////////////////////////////////////////////////////////////////////
         //
     _isActive: {
-        value: null
+        value: true
     },
     ////////////////////////////////////////////////////////////////////
         //
@@ -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);
@@ -151,7 +151,7 @@ exports.BaseDocumentModel = Montage.create(Component, {
                                 head: this.views.design.iframe.contentWindow.document.head,
                                 body: this.views.design.iframe.contentWindow.document.body,
                                 mjsTemplateCreator: this.views.design.iframe.contentWindow.mjsTemplateCreator
-                        }, callback.bind(this));
+                        }, this.handleSaved.bind({callback: callback, model: this}));
                 } else {
                         //TODO: Add logic to save code view data
                 }
@@ -180,7 +180,7 @@ exports.BaseDocumentModel = Montage.create(Component, {
                                 head: this.views.design.iframe.contentWindow.document.head,
                                 body: this.views.design.iframe.contentWindow.document.body,
                                 mjsTemplateCreator: this.views.design.iframe.contentWindow.mjsTemplateCreator
-                        }, callback.bind(this));
+                        }, this.handleSaved.bind({callback: callback, model: this}));
                 } else {
                         //TODO: Add logic to save code view data
                 }
@@ -190,7 +190,7 @@ exports.BaseDocumentModel = Montage.create(Component, {
     ////////////////////////////////////////////////////////////////////
         //
         saveAs: {
-        value: function () {
+        value: function (callback) {
                 //
                 if (this.needsSave) {
                         //Save current file on memory
@@ -201,6 +201,18 @@ exports.BaseDocumentModel = Montage.create(Component, {
     },
     ////////////////////////////////////////////////////////////////////
         //
+        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)
diff --git a/js/document/models/html.js b/js/document/models/html.js
index 67457863..9cc8ce92 100755
--- a/js/document/models/html.js
+++ b/js/document/models/html.js
@@ -22,12 +22,34 @@ exports.HtmlDocumentModel = Montage.create(BaseDocumentModel, {
     selection: {
         value: []
     },
+    ////////////////////////////////////////////////////////////////////
+    //
+    selectionContainer: {
+        value: []
+    },
         ////////////////////////////////////////////////////////////////////
         //
     draw3DGrid: {
         value: false
     },
     ////////////////////////////////////////////////////////////////////
+    //
+    scrollLeft: {
+        value: null
+    },
+
+    scrollTop: {
+        value: null
+    },
+
+    userContentLeft: {
+        value: null
+    },
+
+    userContentTop: {
+        value: null
+    },
+    ////////////////////////////////////////////////////////////////////
         //
         baseHref: {
                 value: null
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