Merge branch 'refs/heads/master' into montage-v10-integration

Conflicts:
	js/io/system/ninjalibrary.json
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

8 files changed, 331 insertions, 128 deletions

diff --git a/js/document/document-html.js b/js/document/document-html.js
index 33a41a8e..15f88d09 100755
--- a/js/document/document-html.js
+++ b/js/document/document-html.js
@@ -68,6 +68,8 @@ exports.HtmlDocument = Montage.create(Component, {
                 if (this.model.views.design.initialize(this.model.parentContainer)) {
                         //Hiding iFrame, just initiliazing
                         this.model.views.design.hide();
+                        //Setting the iFrame property for reference in helper class
+                        this.model.webGlHelper.iframe = this.model.views.design.iframe;
                 } else {
                         //ERROR: Design View not initialized
                 }
@@ -82,13 +84,13 @@ exports.HtmlDocument = Montage.create(Component, {
                 this.model.views.design.iframe.style.opacity = 0;
                 this.model.views.design.content = this.model.file.content;
                 //TODO: Improve reference (probably through binding values)
-                this.model.views.design.model = this.model;
+                this.model.views.design._webGlHelper = this.model.webGlHelper;
                 //Rendering design view, using observers to know when template is ready
                 this.model.views.design.render(function () {
                         //Adding observer to know when template is ready
                         this._observer = new WebKitMutationObserver(this.handleTemplateReady.bind(this));
                                 this._observer.observe(this.model.views.design.document.head, {childList: true});
-                }.bind(this), template);
+                }.bind(this), template, {viewCallback: this.handleViewReady, context: this});
             } else {
                 //TODO: Identify default view (probably code)
             }
@@ -101,10 +103,20 @@ exports.HtmlDocument = Montage.create(Component, {
                 //Removing observer, only needed on initial load
                 this._observer.disconnect();
                 this._observer = null;
-                //Making callback after view is loaded
-            this.loaded.callback.call(this.loaded.context, this);
         }
     },
+    handleViewReady: {
+        value: function() {
+            // TODO: Find a better way to initialize this property
+            // Assign the domContainer to be the document root on open
+            if(typeof this.model.domContainer !== "undefined") {
+                this.model.domContainer = this.model.documentRoot;
+            }
+
+            //Making callback after view is loaded
+            this.loaded.callback.call(this.loaded.context, this);
+        }
+    },
     ////////////////////////////////////////////////////////////////////
         //
         closeDocument: {
diff --git a/js/document/helpers/webgl-helper.js b/js/document/helpers/webgl-helper.js
index 84ddc547..6d9ced14 100755
--- a/js/document/helpers/webgl-helper.js
+++ b/js/document/helpers/webgl-helper.js
@@ -40,7 +40,7 @@ exports.webGlDocumentHelper = Montage.create(Component, {
                         if (elt) {
                                 var matLib = MaterialsModel.exportMaterials();
                                 this._glData = [matLib];
-                                this.collectGLData(elt, this._glData );
+                                this.collectGLData(this.iframe.contentWindow.document, this._glData );
                         } else {
                                 this._glData = null
                         }
@@ -97,10 +97,6 @@ exports.webGlDocumentHelper = Montage.create(Component, {
                                                 //
                                                 if (canvas) {
                                                         //
-                                                        if (!canvas.elementModel) {
-                                                                NJUtils.makeElementModel(canvas, "Canvas", "shape", true);
-                                                        }
-                                                        //
                                                         if (canvas.elementModel) {
                                                                 if (canvas.elementModel.shapeModel.GLWorld) {
                                                                         canvas.elementModel.shapeModel.GLWorld.clearTree();
@@ -194,6 +190,13 @@ exports.webGlDocumentHelper = Montage.create(Component, {
         //
         collectGLData: {
                 value: function( elt,  dataArray ) {
+            Array.prototype.slice.call(elt.querySelectorAll('[data-RDGE-id]'),0).forEach(function(glCanvas) {
+                dataArray.push(glCanvas.elementModel.shapeModel.GLWorld.exportJSON());
+            });
+
+            // Removing the old loop that went through all the elements.
+            // TODO: Remove the following code once QE has tested it.
+/*
                         //
                         var i, data, nKids, child;
                         //
@@ -209,6 +212,7 @@ exports.webGlDocumentHelper = Montage.create(Component, {
                                         this.collectGLData( child, dataArray );
                                 }
                         }
+                        */
                 }
         }
         ////////////////////////////////////////////////////////////////////
diff --git a/js/document/mediators/template.js b/js/document/mediators/template.js
index 068a1f48..50fad1c3 100755
--- a/js/document/mediators/template.js
+++ b/js/document/mediators/template.js
@@ -8,7 +8,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 //
 var Montage =                   require("montage/core/core").Montage,
         Component =             require("montage/ui/component").Component,
-        TemplateCreator =       require("node_modules/tools/template/template-creator").TemplateCreator;
+        TemplateCreator =       require("node_modules/tools/template/template-creator").TemplateCreator,
+        ClassUuid =             require("js/components/core/class-uuid").ClassUuid;
 ////////////////////////////////////////////////////////////////////////
 //      
 exports.TemplateDocumentMediator = Montage.create(Component, {
@@ -83,9 +84,24 @@ exports.TemplateDocumentMediator = Montage.create(Component, {
     parseHtmlToNinjaTemplate: {
         value: function (html) {
             //Creating temp object to mimic HTML
-            var doc = window.document.implementation.createHTMLDocument(), template;
+            var doc = window.document.implementation.createHTMLDocument(), template, docHtmlTag,
+                hackHtml = document.createElement('html'), hackTag;
             //Setting content to temp
             doc.getElementsByTagName('html')[0].innerHTML = html;
+            //TODO: Improve this, very bad way of copying attributes (in a pinch to get it working)
+            hackHtml.innerHTML = html.replace(/html/gi, 'ninjahtmlhack');
+            hackTag = hackHtml.getElementsByTagName('ninjahtmlhack')[0];
+            docHtmlTag = doc.getElementsByTagName('html')[0];
+            //Looping through the attributes to copy them
+            if (hackTag) {
+                    for (var m in hackTag.attributes) {
+                                        if (hackTag.attributes[m].value) {
+                                                docHtmlTag.setAttribute(hackTag.attributes[m].name.replace(/ninjahtmlhack/gi, 'html'), hackTag.attributes[m].value.replace(/ninjahtmlhack/gi, 'html'));
+                                        }
+                                }
+                        }
+                        //Garbage collection
+            hackHtml = hackTag = null;
             //Creating return object
             return {head: doc.head.innerHTML, body: doc.body.innerHTML, document: doc};
         }
@@ -93,7 +109,7 @@ exports.TemplateDocumentMediator = Montage.create(Component, {
     ////////////////////////////////////////////////////////////////////
     //TODO: Expand to allow more templates, clean up variables
     parseNinjaTemplateToHtml: {
-        value: function (template, ninjaWrapper, libCopyCallback) {
+        value: function (saveExternalData, template, ninjaWrapper, libCopyCallback) {
                 //TODO: Improve reference for rootUrl
             var regexRootUrl,
                 rootUrl = this.application.ninja.coreIoApi.rootUrl + escape((this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1])),
@@ -116,20 +132,36 @@ exports.TemplateDocumentMediator = 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, '');
             }
+            //Removes all attributes from node
+            function wipeAttributes (node) {
+                    for (var f in node.attributes) {
+                            node.removeAttribute(node.attributes[f].name);
+                            }
+            }
             //Copying attributes to maintain same properties as the <body>
+            wipeAttributes(template.file.content.document.body);
                         for (var n in template.body.attributes) {
                                 if (template.body.attributes[n].value) {
-                                        //
                                         template.file.content.document.body.setAttribute(template.body.attributes[n].name, template.body.attributes[n].value);
                                 }                               
                         }
-            
-            
-            
-            //TODO: Add attribute copying for <HEAD> and <HTML>
+                        wipeAttributes(template.file.content.document.head);
+            //Copying attributes to maintain same properties as the <head>
+                        for (var m in template.document.head.attributes) {
+                                if (template.document.head.attributes[m].value) {