3 files changed, 37 insertions, 12 deletions

diff --git a/js/document/models/base.js b/js/document/models/base.js
index 6d9d2e89..0957145a 100755
--- a/js/document/models/base.js
+++ b/js/document/models/base.js
@@ -62,6 +62,20 @@ exports.BaseDocumentModel = Montage.create(Component, {
     },
     ////////////////////////////////////////////////////////////////////
         //
+    _selection: {
+        value: []
+    },
+
+    selection: {
+        get: function() {
+            return this._selection;
+        },
+        set: function(value) {
+            this._selection = value;
+        }
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
     fileTemplate: {
         value: null
     },
@@ -85,11 +99,20 @@ exports.BaseDocumentModel = Montage.create(Component, {
     ////////////////////////////////////////////////////////////////////
         //TODO: Add API to allow other browser support
         browserPreview: {
-        value: function (browser) {
+        value: function (browser, screen, context) {
+                //Making call to show feedback screen
+                if (screen) screen.show(context);
                 //Generating URL for document
                 var url = this.application.ninja.coreIoApi.rootUrl + this.file.uri.split(this.application.ninja.coreIoApi.cloudData.root)[1];
                 //TODO: Add logic to prompt user to save (all) before preview
-                this.saveAll(function (result) {
+                this.saveAll(null,function (success) {
+                        //Making call to show feedback screen
+                        if (screen) screen.hide(context);
+                        //TODO: Add error handling logic
+                        if (!success) {
+                                console.log('Error!');
+                                return;
+                        }
                         //Currently only supporting current browser (Chrome, obviously)
                         switch (this.browser) {
                                 case 'chrome':
@@ -131,7 +154,7 @@ exports.BaseDocumentModel = Montage.create(Component, {
     ////////////////////////////////////////////////////////////////////
         //
         save: {
-        value: function (callback) {
+        value: function (callback, libCopyCallback) {
                 //
                 if (this.needsSave) {
                         //Save
@@ -151,7 +174,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
-                        }, this.handleSaved.bind({callback: callback, model: this}));
+                        }, this.handleSaved.bind({callback: callback, model: this}), libCopyCallback);
                 } else {
                         //TODO: Add logic to save code view data
                 }
@@ -160,7 +183,7 @@ exports.BaseDocumentModel = Montage.create(Component, {
     ////////////////////////////////////////////////////////////////////
         //
         saveAll: {
-        value: function (callback) {
+        value: function (callback, libCopyCallback) {
                 //
                 if (this.needsSave) {
                         //Save
@@ -180,7 +203,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
-                        }, this.handleSaved.bind({callback: callback, model: this}));
+                        }, this.handleSaved.bind({callback: callback, model: this}), libCopyCallback);
                 } else {
                         //TODO: Add logic to save code view data
                 }
diff --git a/js/document/models/html.js b/js/document/models/html.js
index fd42d4de..9aa0d27e 100755
--- a/js/document/models/html.js
+++ b/js/document/models/html.js
@@ -18,9 +18,12 @@ exports.HtmlDocumentModel = Montage.create(BaseDocumentModel, {
         value: false
     },
     ////////////////////////////////////////////////////////////////////
-    //
-    selection: {
-        value: []
+        //Called by the document immidiately after the model is created
+    init: {
+        value:function() {
+                //Creating instance of the webGL helper for this model
+                this.webGlHelper = webGlDocumentHelper.create();
+                }           
     },
     ////////////////////////////////////////////////////////////////////
     //
@@ -57,7 +60,7 @@ exports.HtmlDocumentModel = Montage.create(BaseDocumentModel, {
     ////////////////////////////////////////////////////////////////////
         //
         webGlHelper: {
-        value: webGlDocumentHelper
+        value: null
     },
     ////////////////////////////////////////////////////////////////////
         //
diff --git a/js/document/models/text.js b/js/document/models/text.js
index d1252b7d..6cb61d48 100755
--- a/js/document/models/text.js
+++ b/js/document/models/text.js
@@ -22,7 +22,7 @@ exports.TextDocumentModel = Montage.create(BaseDocumentModel, {
     save: {
         enumerable: false,
         value: function (callback) {
-            this.application.ninja.documentController.activeDocument.model.views.code.editor.save();//save to textarea
+            this.application.ninja.currentDocument.model.views.code.editor.save();//save to textarea
 
             var self = this;
 
@@ -60,7 +60,6 @@ exports.TextDocumentModel = Montage.create(BaseDocumentModel, {
                 }
                 //
                 this.parentContainer.removeChild(this.views.code.textViewContainer);
-                this.application.ninja.stage.showCodeViewBar(false);
                 this.application.ninja.stage.restoreAllPanels();
                 this.views.code = null;