4 files changed, 83 insertions, 58 deletions

diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index f1523d87..cf618360 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -145,18 +145,19 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
         value: function(event) {
                 //
                 if((typeof this.activeDocument !== "undefined") && this.application.ninja.coreIoApi.cloudAvailable()){
-                        //
-                        this.activeDocument.model.save(this.testCallback.bind(this)); //this.fileSaveResult.bind(this)
+                        //Currently we don't need a callback handler
+                        //this.activeDocument.model.save(this.saveExecuted.bind(this));
+                        this.activeDocument.model.save();
                 } else {
-                        //Error:
+                        //Error: cloud not available and/or no active document
                 }
                 }
     },
-    testCallback: {
+    ////////////////////////////////////////////////////////////////////
+        //
+    saveExecuted: {
         value: function (value) {
-                console.log(value);
-            //TODO: Move this to the model.save()
-            this.activeDocument.model.needsSave = false;
+                //File saved, any callbacks or events should go here
         }
     },
     ////////////////////////////////////////////////////////////////////
diff --git a/js/document/models/base.js b/js/document/models/base.js
index df341b2f..c99e36c7 100755
--- a/js/document/models/base.js
+++ b/js/document/models/base.js
@@ -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/views/design.js b/js/document/views/design.js
index 2ccb82d1..bd8c25ec 100755
--- a/js/document/views/design.js
+++ b/js/document/views/design.js
@@ -184,8 +184,7 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
                 this._bodyFragment = null;
                 //Calling standard method to finish opening document
                 this.bodyContentLoaded(null);
-
-            // TODO: Clean up this code
+            //TODO: Move this to be set via the controller
             this.application.ninja.stage.documentOffsetLeft = parseInt((this.document.body.scrollWidth - this._template.size.width)/2);
             this.application.ninja.stage.documentOffsetTop = parseInt((this.document.body.scrollHeight - this._template.size.height)/2);
         }
@@ -243,17 +242,15 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
                                         }
                                 }
                         }
-            //Checking and initializing webGL
+                //Checking for script tags then parsing check for montage and webgl
             if (scripttags.length > 0) {
+                //Checking and initializing webGL
                 this.initWebGl(scripttags);
-            } //Else there is not data to parse
-                
-                
-                
-                //TODO: Load Montage Components (blocking)
-                //this.initMontage();
-                
-                
+                //Checking and initializing Montage
+                this.initMontage(scripttags);
+            } else {
+                //Else there is not data to parse
+            }
                 //Makign callback if specified
                 if (this._callback) this._callback();
         }
@@ -350,8 +347,14 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
     ////////////////////////////////////////////////////////////////////
         //
     initMontage: {
-        value: function () {
-                //initWithDocument(window.document) instantiateWithOwnerAndDocument(null, window.document)
+        value: function (scripttags) {
+                //
+                this.iframe.contentWindow.document.body.addEventListener('mjsTemplateReady', function () {
+                        //Initializing template with user's seriliazation
+                        var template = this.iframe.contentWindow.mjsTemplate.create();
+                        template.initWithDocument(this.iframe.contentWindow.document);
+                        template.instantiateWithOwnerAndDocument(null, this.iframe.contentWindow.document, function (e){/*Nothing just a required extra parameter*/});
+                }.bind(this), false);
         }
     },
     ////////////////////////////////////////////////////////////////////
diff --git a/js/mediators/io-mediator.js b/js/mediators/io-mediator.js
index b1916446..ade27728 100644
--- a/js/mediators/io-mediator.js
+++ b/js/mediators/io-mediator.js
@@ -225,7 +225,7 @@ exports.IoMediator = Montage.create(Component, {
                 mjsCreator = template.mjsTemplateCreator.create(),
                 mJsSerialization,
                 montageTemplate;
-            //
+            //Creating instance of template creator
             montageTemplate = mjsCreator.initWithDocument(template.document);
             //Setting up expression for parsing URLs
             regexRootUrl = new RegExp(rootUrl.replace(/\//gi, '\\\/'), 'gi');
@@ -239,7 +239,6 @@ exports.IoMediator = Montage.create(Component, {
                 template.file.content.document.head.innerHTML = template.head.innerHTML.replace(regexRootUrl, '');
                     template.file.content.document.body.innerHTML = template.body.innerHTML.replace(regexRootUrl, '');
             }
-            
             //Copying attributes to maintain same properties as the <body>
                         for (var n in template.body.attributes) {
                                 if (template.body.attributes[n].value) {
@@ -250,6 +249,7 @@ exports.IoMediator = Montage.create(Component, {
             //TODO: Add attribute copying for <HEAD> and <HTML>
             
             
+            //console.log(template.file.content.document.getElementsByTagName('html')[0].innerHTML);
             
             
             //Getting all CSS (style or link) tags
@@ -266,7 +266,7 @@ exports.IoMediator = Montage.create(Component, {
                 }
                 //////////////////////////////////////////////////
                 
-                //
+                //Adding to tags to be removed form template
                 for (var f in njtemplatetags) {
                         if (njtemplatetags[f].getAttribute) toremovetags.push(njtemplatetags[f]);
                 }
@@ -405,6 +405,31 @@ exports.IoMediator = Montage.create(Component, {
                     }
                 }
             }
+            //
+            var matchingtags = [], scripts = template.file.content.document.getElementsByTagName('script'), webgltag, webgljstag, webgllibtag, webglrdgetag, mjstag, mjslibtag;
+            //
+            for (var i in scripts) {
+                if (scripts[i].getAttribute) {
+                        if (scripts[i].getAttribute('data-ninja-webgl') !== null) {//TODO: Use querySelectorAll
+                                matchingtags.push(scripts[i]);
+                    }
+                    if (scripts[i].getAttribute('data-ninja-webgl-js') !== null) {
+                        webgljstag = scripts[i]; // TODO: Add logic to delete unneccesary tags
+                    }
+                    if (scripts[i].getAttribute('data-ninja-webgl-lib') !== null) {
+                        webgllibtag = scripts[i]; // TODO: Add logic to delete unneccesary tags
+                    }
+                    if (scripts[i].getAttribute('data-ninja-webgl-rdge') !== null) {
+                        webglrdgetag = scripts[i]; // TODO: Add logic to delete unneccesary tags
+                    }
+                    if (scripts[i].getAttribute('type') === 'text/montage-serialization') {