From c82ac0c0a0120f45c9bb4a42bdd2502d0cc77bdb Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Tue, 5 Jun 2012 21:38:25 -0700
Subject: cleanup and making the webgl-helper only loop canvas on file save

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/components/converter/string-units-converter.js |  2 --
 js/components/converter/string-value-converter.js |  2 --
 js/document/helpers/webgl-helper.js               | 14 +++++++++-----
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'js')

diff --git a/js/components/converter/string-units-converter.js b/js/components/converter/string-units-converter.js
index 6b97d5c5..9f6e4112 100644
--- a/js/components/converter/string-units-converter.js
+++ b/js/components/converter/string-units-converter.js
@@ -9,7 +9,6 @@ var Montage = require("montage").Montage,
 
 exports.StringUnitsConverter = Montage.create(Converter, {
 
-    // convert fahrenheit to celsius (showing our non-metric heritage here)
     convert: {
         value: function(value) {
             if(value) {
@@ -20,7 +19,6 @@ exports.StringUnitsConverter = Montage.create(Converter, {
         }
     },
 
-    // revert celsius to fahrenheit
     revert: {
         value: function(value) {
             console.log("revert string to unit ", value);
diff --git a/js/components/converter/string-value-converter.js b/js/components/converter/string-value-converter.js
index 28d7dd29..f397f731 100644
--- a/js/components/converter/string-value-converter.js
+++ b/js/components/converter/string-value-converter.js
@@ -9,7 +9,6 @@ var Montage = require("montage").Montage,
 
 exports.StringValueConverter = Montage.create(Converter, {
 
-    // convert fahrenheit to celsius (showing our non-metric heritage here)
     convert: {
         value: function(value) {
             console.log(value);
@@ -18,7 +17,6 @@ exports.StringValueConverter = Montage.create(Converter, {
         }
     },
 
-    // revert celsius to fahrenheit
     revert: {
         value: function(value) {
             console.log("revert string to value ", value);
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
 			}
@@ -96,10 +96,6 @@ exports.webGlDocumentHelper = Montage.create(Component, {
 						canvas = this.findCanvasWithID(id, elt);
 						//
 						if (canvas) {
-							//
-							if (!canvas.elementModel) {
-								NJUtils.makeElementModel(canvas, "Canvas", "shape", true);
-							}
 							//
 							if (canvas.elementModel) {
 								if (canvas.elementModel.shapeModel.GLWorld) {
@@ -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 );
 				}
 			}
+			*/
 		}
 	}
 	////////////////////////////////////////////////////////////////////
-- 
cgit v1.2.3