1 files changed, 32 insertions, 15 deletions

diff --git a/js/document/views/design.js b/js/document/views/design.js
index 2ccb82d1..b3887fdf 100755
--- a/js/document/views/design.js
+++ b/js/document/views/design.js
@@ -64,6 +64,11 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
     },
     ////////////////////////////////////////////////////////////////////
         //
+    propertiesPanel: {
+        value: null
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
         initialize: {
         value: function (parent) {
                 //Creating iFrame for view
@@ -184,8 +189,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 +247,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();
         }
@@ -322,7 +324,7 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
     initWebGl: {
         value: function (scripttags) {
                 //
-                var n, webgldata;
+                var n, webgldata, fileRead;
                 //Setting the iFrame property for reference in helper class
                 this.model.webGlHelper.iframe = this.model.views.design.iframe;
                 //Checking for webGL Data
@@ -331,9 +333,18 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
                 webgldata = null;
                 //Checking for tags with webGL data
                 if (scripttags[w].getAttribute) {
-                        if (scripttags[w].getAttribute('data-ninja-webgl') !== null) {
+                        if (scripttags[w].getAttribute('data-ninja-canvas') !== null) {
                                 //TODO: Add logic to handle more than one data tag
                                 webgldata = JSON.parse((scripttags[w].innerHTML.replace("(", "")).replace(")", ""));
+                        } else if (scripttags[w].getAttribute('data-ninja-canvas-json') !== null) {
+                                //TODO: Add check for hardcoded URL
+                                fileRead = this.application.ninja.ioMediator.fio.readFile({uri: this.application.ninja.documentController.documentHackReference.root+scripttags[w].getAttribute('data-ninja-canvas-json')});
+                                //
+                                if (fileRead.status === 204) {
+                                        webgldata = JSON.parse((fileRead.file.content.replace("(", "")).replace(")", ""));
+                                } else {
+                                        //Error
+                                }
                         }
                         //Checking for webGL data and building data array
                         if (webgldata && webgldata.data) {
@@ -350,8 +361,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);
         }
     },
     ////////////////////////////////////////////////////////////////////