Merge branch 'refs/heads/TimelineUberjd' into TimelineUber

Conflicts:
	js/controllers/elements/element-controller.js
	js/document/_toDelete/html-document.js
	js/panels/Timeline/Layer.reel/Layer.js

Signed-off-by: Kruti Shah <kruti.shah@motorola.com>

1 files changed, 9 insertions, 5 deletions

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 );
                                 }
                         }
+                        */
                 }
         }
         ////////////////////////////////////////////////////////////////////