Merge branch 'binding' of github.com:dhg637/ninja-internal into binding

3 files changed, 115 insertions, 67 deletions

diff --git a/js/document/models/base.js b/js/document/models/base.js
index 6d9d2e89..9c26bd2a 100755
--- a/js/document/models/base.js
+++ b/js/document/models/base.js
@@ -62,6 +62,17 @@ exports.BaseDocumentModel = Montage.create(Component, {
     },
     ////////////////////////////////////////////////////////////////////
         //
+    _selection: {
+        value: []
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
+    selection: {
+        get: function() {return this._selection;},
+        set: function(value) {this._selection = value;}
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
     fileTemplate: {
         value: null
     },
@@ -77,6 +88,24 @@ exports.BaseDocumentModel = Montage.create(Component, {
     },
     ////////////////////////////////////////////////////////////////////
         //
+        libs: {
+        value: null
+    },
+
+    _mObjects: {
+            value: []
+        },
+
+        mObjects: {
+            get: function() {
+                return this._mObjects;
+            },
+            set: function(value) {
+                this._mObjects = value;
+            }
+        },
+    ////////////////////////////////////////////////////////////////////
+        //
         switchViewTo: {
         value: function (view) {
                 //
@@ -85,11 +114,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':
@@ -111,28 +149,30 @@ exports.BaseDocumentModel = Montage.create(Component, {
         }
     },
     ////////////////////////////////////////////////////////////////////
-        //
+        //Gets all stylesheets in document
         getStyleSheets: {
                 value: function () {
-                        //
+                        //Array to store styles (style and link tags)
                         var styles = [];
-                //
+                //Looping through document sytles
                 for (var k in this.views.design.iframe.contentWindow.document.styleSheets) {
+                        //Check for styles to has proper propeties
                         if (this.views.design.iframe.contentWindow.document.styleSheets[k].ownerNode && this.views.design.iframe.contentWindow.document.styleSheets[k].ownerNode.getAttribute) {
+                                //Check for ninja-template styles, if so, exclude
                         if (this.views.design.iframe.contentWindow.document.styleSheets[k].ownerNode.getAttribute('data-ninja-template') === null) {
                                 styles.push(this.views.design.iframe.contentWindow.document.styleSheets[k]);
                         }
                 }
                 }
-                //
+                //Returning filtered results
                 return styles;
                 }
         },
     ////////////////////////////////////////////////////////////////////
         //
         save: {
-        value: function (callback) {
-                //
+        value: function (callback, libCopyCallback) {
+                //TODO: Implement on demand logic
                 if (this.needsSave) {
                         //Save
                 } else {
@@ -141,8 +181,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(),
@@ -151,7 +192,18 @@ 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);
+                        //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
                 }
@@ -160,8 +212,8 @@ exports.BaseDocumentModel = Montage.create(Component, {
     ////////////////////////////////////////////////////////////////////
         //
         saveAll: {
-        value: function (callback) {
-                //
+        value: function (callback, libCopyCallback) {
+                //TODO: Implement on demand logic
                 if (this.needsSave) {
                         //Save
                 } else {
@@ -170,8 +222,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(),
@@ -180,7 +233,18 @@ 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);
+                        //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
                 }
@@ -191,47 +255,49 @@ exports.BaseDocumentModel = Montage.create(Component, {
         //
         saveAs: {
         value: function (callback) {
-                //
+                //TODO: Implement on demand logic
                 if (this.needsSave) {
                         //Save current file on memory
                 } else {
                         //Copy file from disk