Merge branch 'master' into brushtool

2 files changed, 35 insertions, 31 deletions

diff --git a/js/document/models/base.js b/js/document/models/base.js
index a3644815..5fa06259 100755
--- a/js/document/models/base.js
+++ b/js/document/models/base.js
@@ -68,12 +68,8 @@ exports.BaseDocumentModel = Montage.create(Component, {
     ////////////////////////////////////////////////////////////////////
     //
     selection: {
-        get: function() {
-            return this._selection;
-        },
-        set: function(value) {
-            this._selection = value;
-        }
+        get: function() {return this._selection;},
+        set: function(value) {this._selection = value;}
     },
     ////////////////////////////////////////////////////////////////////
     //
@@ -92,6 +88,11 @@ exports.BaseDocumentModel = Montage.create(Component, {
     },
     ////////////////////////////////////////////////////////////////////
         //
+        libs: {
+        value: null
+    },
+    ////////////////////////////////////////////////////////////////////
+        //
         switchViewTo: {
         value: function (view) {
                 //
@@ -167,8 +168,9 @@ exports.BaseDocumentModel = Montage.create(Component, {
                 //
                 if (this.currentView === this.views.design) {
                 //
-                        this.application.ninja.ioMediator.fileSave({
+                        var save = this.application.ninja.ioMediator.fileSave({
                                 mode: 'html',
+                                libs: this.libs,
                                 file: this.file,
                                 webgl: this.webGlHelper.glData,
                                 styles: this.getStyleSheets(),
@@ -178,6 +180,17 @@ exports.BaseDocumentModel = Montage.create(Component, {
                                 body: this.views.design.iframe.contentWindow.document.body,
                                 mjsTemplateCreator: this.views.design.iframe.contentWindow.mjsTemplateCreator
                         }, this.handleSaved.bind({callback: callback, model: this}), libCopyCallback);
+                        //TODO: Improve detection during save routine
+                        if (save) {
+                                if (save.montageId) {
+                                        this.libs.montageId = save.montageId;
+                                        this.libs.montage = true;
+                                }
+                                if (save.canvasId) {
+                                        this.libs.canvasId = save.canvasId;
+                                        this.libs.canvas = true;
+                                }
+                        }
                 } else {
                         //TODO: Add logic to save code view data
                 }
@@ -196,8 +209,9 @@ exports.BaseDocumentModel = Montage.create(Component, {
                 //
                 if (this.currentView === this.views.design) {
                 //
-                        this.application.ninja.ioMediator.fileSave({
+                        var save = this.application.ninja.ioMediator.fileSave({
                                 mode: 'html',
+                                libs: this.libs,
                                 file: this.file,
                                 webgl: this.webGlHelper.glData,
                                 css: this.getStyleSheets(),
@@ -207,6 +221,17 @@ exports.BaseDocumentModel = Montage.create(Component, {
                                 body: this.views.design.iframe.contentWindow.document.body,
                                 mjsTemplateCreator: this.views.design.iframe.contentWindow.mjsTemplateCreator
                         }, this.handleSaved.bind({callback: callback, model: this}), libCopyCallback);
+                        //TODO: Improve detection during save routine
+                        if (save) {
+                                if (save.montageId) {
+                                        this.libs.montageId = save.montageId;
+                                        this.libs.montage = true;
+                                }
+                                if (save.canvasId) {
+                                        this.libs.canvasId = save.canvasId;
+                                        this.libs.canvas = true;
+                                }
+                        }
                 } else {
                         //TODO: Add logic to save code view data
                 }
diff --git a/js/document/models/html.js b/js/document/models/html.js
index 0f88229d..7064c6e3 100755
--- a/js/document/models/html.js
+++ b/js/document/models/html.js
@@ -23,6 +23,8 @@ exports.HtmlDocumentModel = Montage.create(BaseDocumentModel, {
         value:function() {
                 //Creating instance of the webGL helper for this model
                 this.webGlHelper = webGlDocumentHelper.create();
+                //
+                this.libs = {montage: false, canvas: false, montageId: null, canvasId: null};
                 }           
     },
     ////////////////////////////////////////////////////////////////////
@@ -73,29 +75,6 @@ exports.HtmlDocumentModel = Montage.create(BaseDocumentModel, {
         value: null
     },
     ////////////////////////////////////////////////////////////////////
-        //
-    userComponents: {
-        value: {}
-    },
-        ////////////////////////////////////////////////////////////////////
-        //Add a reference to a component instance to the userComponents hash using the element UUID
-    setComponentInstance: {
-        value: function(instance, el) {
-            this.userComponents[el.uuid] = instance;
-        }
-    },
-    ////////////////////////////////////////////////////////////////////
-        //Returns the component instance obj from the element
-    getComponentFromElement: {
-        value: function(el) {
-            if(el) {
-                if(el.uuid) return this.userComponents[el.uuid];
-            } else {
-                return null;
-            }
-        }
-    }
-        ////////////////////////////////////////////////////////////////////
         ////////////////////////////////////////////////////////////////////
 });
 ////////////////////////////////////////////////////////////////////////