Merge pull request #250 from joseeight/Document

Montage components mapping & External data webGL support

5 files changed, 136 insertions, 47 deletions

diff --git a/js/document/document-html.js b/js/document/document-html.js
index bb391793..d6b4ba95 100755
--- a/js/document/document-html.js
+++ b/js/document/document-html.js
@@ -125,9 +125,10 @@ exports.HtmlDocument = Montage.create(Component, {
         //
         closeDocument: {
                 value: function (context, callback) {
+                        //Closing document and getting outcome
                         var closed = this.model.close(null);
-
-            callback.call(context, this);
+                        //Making callback if specified
+                        if (callback) callback.call(context, this);
                 }
         },
     ////////////////////////////////////////////////////////////////////
@@ -139,6 +140,7 @@ exports.HtmlDocument = Montage.create(Component, {
             //this.gridVerticalSpacing = this.application.ninja.stage.drawUtils.gridVerticalSpacing;
 
             // Serialize the current scroll position
+            //TODO: Move these properties to the design view class
             this.model.scrollLeft = this.application.ninja.stage._scrollLeft;
             this.model.scrollTop = this.application.ninja.stage._scrollTop;
             this.model.userContentLeft = this.application.ninja.stage._userContentLeft;
@@ -146,6 +148,7 @@ exports.HtmlDocument = Montage.create(Component, {
 
 
             // Serialize the selection
+            //TODO: Move this property to the design view class
             this.model.selection = this.application.ninja.selectedElements.slice(0);
             this.draw3DGrid = this.application.ninja.appModel.show3dGrid;
 
@@ -153,9 +156,8 @@ exports.HtmlDocument = Montage.create(Component, {
             // TODO: Save the montage undo queue
 
             // Pause the videos
+            //TODO: Move these to be handled on the show/hide methods in the view
             this.model.views.design.pauseVideos();
-
-//            this.model.isActive = false;
         }
     },
     ////////////////////////////////////////////////////////////////////
@@ -167,18 +169,21 @@ exports.HtmlDocument = Montage.create(Component, {
             //this.application.ninja.stage.drawUtils.gridVerticalSpacing = this.gridVerticalSpacing;
 
             // Deserialize the current scroll position
+             //TODO: Move these properties to the design view class
             this.application.ninja.stage._scrollLeft = this.model.scrollLeft;
             this.application.ninja.stage._scrollTop = this.model.scrollTop;
             this.application.ninja.stage._userContentLeft = this.model.userContentLeft;
             this.application.ninja.stage._userContentTop = this.model.userContentTop;
-
+                        
+                        //TODO: Move this property to the design view class
             this.application.ninja.selectedElements = this.model.selection.slice(0);
 
             this.application.ninja.appModel.show3dGrid = this.draw3DGrid;
 
             // Serialize the undo
             // TODO: Save the montage undo queue
-
+                        
+                        //TODO: Move this to the document controller
             this.model.isActive = true;
         }
     }
diff --git a/js/document/models/base.js b/js/document/models/base.js
index c99e36c7..6d9d2e89 100755
--- a/js/document/models/base.js
+++ b/js/document/models/base.js
@@ -100,7 +100,7 @@ exports.BaseDocumentModel = Montage.create(Component, {
                                         }
                                         break;
                         default:
-                                        if (this.template.type === 'banner' || this.template.type === 'animation') {
+                                        if (this.template && (this.template.type === 'banner' || this.template.type === 'animation')) {
                                                 window.open('/js/document/templates/preview/banner.html?width='+this.template.size.width+'&height='+this.template.size.height+'&url='+this.url);
                                         } else {
                                                 window.open(this.url);
diff --git a/js/document/views/design.js b/js/document/views/design.js
index 3f58650e..b3887fdf 100755
--- a/js/document/views/design.js
+++ b/js/document/views/design.js
@@ -324,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
@@ -333,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) {
diff --git a/js/io/system/ninjalibrary.json b/js/io/system/ninjalibrary.json
index 041e7ed7..5c1eb875 100644
--- a/js/io/system/ninjalibrary.json
+++ b/js/io/system/ninjalibrary.json
@@ -1,6 +1,6 @@
 {
         "libraries": [
                 {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.10.0.0"},
-                {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.5.6.0"}
+                {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.5.7.0"}
         ]
 }
\ No newline at end of file
diff --git a/js/mediators/io-mediator.js b/js/mediators/io-mediator.js
index ade27728..e9ed86d7 100644
--- a/js/mediators/io-mediator.js
+++ b/js/mediators/io-mediator.js
@@ -203,6 +203,59 @@ exports.IoMediator = Montage.create(Component, {
     },
     ////////////////////////////////////////////////////////////////////
     //
+    getDataDirectory: {
+        value: function (path) {
+                //TODO: Implement user overwrite
+                return this._getUserDirectory(path+'data/');
+        }
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
+    getNinjaDirectory: {
+        value: function (path) {
+                //TODO: Implement user overwrite
+                return this._getUserDirectory(this.getDataDirectory(path)+'ninja/');
+        }
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
+    getCanvasDirectory: {
+        value: function (path) {
+                //TODO: Implement user overwrite
+                return this._getUserDirectory(this.getNinjaDirectory(path)+'canvas/');
+        }
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
+    _getUserDirectory: {
+        value: function (path) {
+                //Checking for data directory
+            var check = this.application.ninja.coreIoApi.fileExists({uri: path}), directory;
+            //Creating directory if doesn't exists
+            switch (check.status) {
+                case 204: //Exists
+                        directory = path;
+                        break;
+                case 404: //Doesn't exists
+                        directory = this.application.ninja.coreIoApi.createDirectory({uri: path});
+                        //Checking for success
+                        if (directory.status === 201) {
+                                directory = path;
+                        } else {
+                                //Error
+                                directory = null;
+                        }
+                        break;
+                default: //Error
+                        directory = null;
+                        break;
+            }
+            //Returning the path to the directory on disk (null for any error)
+            return directory;
+        }
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
     parseHtmlToNinjaTemplate: {
         enumerable: false,
         value: function (html) {
@@ -406,20 +459,19 @@ exports.IoMediator = Montage.create(Component, {
                 }
             }
             //
-            var matchingtags = [], scripts = template.file.content.document.getElementsByTagName('script'), webgltag, webgljstag, webgllibtag, webglrdgetag, mjstag, mjslibtag;
+