Merge branch 'refs/heads/FileIO-Integration' into FileIO-Build-Candidate

1 files changed, 20 insertions, 20 deletions

diff --git a/js/document/html-document.js b/js/document/html-document.js
index 0dc26884..79450494 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -9,7 +9,6 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 var Montage =           require("montage/core/core").Montage,
     TextDocument =      require("js/document/text-document").TextDocument,
     NJUtils =           require("js/lib/NJUtils").NJUtils,
-        CanvasDataManager =     require("js/lib/rdge/runtime/CanvasDataManager").CanvasDataManager,
         GLWorld =                       require("js/lib/drawing/world").World;
 ////////////////////////////////////////////////////////////////////////
 //
@@ -189,35 +188,36 @@ exports.HTMLDocument = Montage.create(TextDocument, {
 //    },
     
     glData: {
-        get: function()
-                {
+        get: function() {
+                        //
                         var elt = this.iframe.contentWindow.document.getElementById("UserContent");
-                        this._glData = null;
-                        if (elt)
-                        {
-                                var cdm = new CanvasDataManager();
+                        //
+                        if (elt) {
                                 this._glData = [];
-                                cdm.collectGLData( elt,  this._glData );
+                                //if (path) {
+                                        //this.collectGLData(elt, this._glData, path);
+                                //} else {
+                                        this.collectGLData(elt, this._glData );
+                                //}
+                        } else {
+                                this._glData = null
                         }
-                                
+                        //      
                         return this._glData;
                 },
-
-        set: function(value)
-                {
+        set: function(value) {
                         var elt = this.documentRoot;
-                        if (elt)
-                        {
+                        if (elt) {
                                 var nWorlds= value.length;
                                 for (var i=0;  i<nWorlds;  i++) {
                                         var importStr = value[i];
-                                        var startIndex = importStr.indexOf("id: ");
+                                        var startIndex = importStr.indexOf( "id: " );
                                         if (startIndex >= 0) {
-                                                var endIndex = importStr.indexOf("\n", startIndex);
+                                                var endIndex = importStr.indexOf( "\n", startIndex );
                                                 if (endIndex > 0) {
-                                                        var id = importStr.substring( startIndex+4, endIndex);
+                                                        var id = importStr.substring( startIndex+4, endIndex );
                                                         if (id) {
-                                                                var canvas = this.findCanvasWithID(id, elt);
+                                                                var canvas = this.findCanvasWithID( id, elt );
                                                                 if (canvas) {
                                                                         if (!canvas.elementModel) {
                                                                                 NJUtils.makeElementModel(canvas, "Canvas", "shape", true);
@@ -228,9 +228,9 @@ exports.HTMLDocument = Montage.create(TextDocument, {
                                                                                 }
                                                                                 var index = importStr.indexOf( "webGL: " );
                                                                                 var useWebGL = (index >= 0)
-                                                                                var world = new GLWorld(canvas, useWebGL);
+                                                                                var world = new GLWorld( canvas, useWebGL );
                                                                                 world.import( importStr );
-                                                                                        this.buildShapeModel(canvas.elementModel, world);
+                                                                                this.buildShapeModel( canvas.elementModel, world );
                                                                         }
                                                                 }
                                                         }