1 files changed, 205 insertions, 41 deletions

diff --git a/js/document/html-document.js b/js/document/html-document.js
index 80930af2..051490f5 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.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,
     TextDocument =      require("js/document/text-document").TextDocument,
-    NJUtils =           require("js/lib/NJUtils").NJUtils;
+    NJUtils =           require("js/lib/NJUtils").NJUtils,
+        GLWorld =                       require("js/lib/drawing/world").World;
 ////////////////////////////////////////////////////////////////////////
 //
 exports.HTMLDocument = Montage.create(TextDocument, {
@@ -187,31 +188,112 @@ 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) {
+                        var elt = this.documentRoot;
+                        if (elt) {
+                                var nWorlds= value.length;
+                                for (var i=0;  i<nWorlds;  i++) {
+                                        var importStr = value[i];
+                                        var startIndex = importStr.indexOf( "id: " );
+                                        if (startIndex >= 0) {
+                                                var endIndex = importStr.indexOf( "\n", startIndex );
+                                                if (endIndex > 0) {
+                                                        var id = importStr.substring( startIndex+4, endIndex );
+                                                        if (id) {
+                                                                var canvas = this.findCanvasWithID( id, elt );
+                                                                if (canvas) {
+                                                                        if (!canvas.elementModel) {
+                                                                                NJUtils.makeElementModel(canvas, "Canvas", "shape", true);
+                                                                        }
+                                                                        if (canvas.elementModel) {
+                                                                                if (canvas.elementModel.shapeModel.GLWorld) {
+                                                                                        canvas.elementModel.shapeModel.GLWorld.clearTree();
+                                                                                }
+                                                                                var index = importStr.indexOf( "webGL: " );
+                                                                                var useWebGL = (index >= 0)
+                                                                                var world = new GLWorld( canvas, useWebGL );
+                                                                                world.import( importStr );
+                                                                                this.buildShapeModel( canvas.elementModel, world );
+                                                                        }
+                                                                }
+                                                        }
+                                                }
+                                        }
+                                }
+                        }
+                }
+    },
 
-        set: function(value)
+        buildShapeModel:
+        {
+                value: function( elementModel, world )
                 {
-                        var elt = this.documentRoot;
-                        if (elt)
+            var shapeModel = elementModel.shapeModel;
+                        shapeModel.shapeCount   = 1;    // for now...
+                        shapeModel.useWebGl             = world._useWebGL;
+                        shapeModel.GLWorld              = world;
+                        var root = world.getGeomRoot();
+                        if (root)
                         {
-                                console.log( "load canvas data: " , value );
-                                var cdm = new CanvasDataManager();
-                                cdm.loadGLData(elt,  value);
+                                shapeModel.GLGeomObj                    = root;
+                                shapeModel.strokeSize                   = root._strokeWidth;
+                                shapeModel.stroke                               = root._strokeColor.slice();
+                                shapeModel.strokeMaterial               = root._strokeMaterial.dup();
+                                shapeModel.strokeStyle                  = "solid";
+                                //shapeModel.strokeStyleIndex
+                                //shapeModel.border
+                                //shapeModel.background
+                                switch (root.geomType())
+                                {
+                                        case root.GEOM_TYPE_RECTANGLE:
+                        elementModel.selection = "Rectangle";
+                        elementModel.pi = "RectanglePi";
+                        shapeModel.fill                                 = root._fillColor.slice();
+                        shapeModel.fillMaterial                 = root._fillMaterial.dup();
+                                                shapeModel.tlRadius = root._tlRadius;
+                                                shapeModel.trRadius = root._trRadius;
+                                                shapeModel.blRadius = root._blRadius;
+                                                shapeModel.brRadius = root._brRadius;
+                                                break;
+
+                                        case root.GEOM_TYPE_CIRCLE:
+                        elementModel.selection = "Oval";
+                        elementModel.pi = "OvalPi";
+                        shapeModel.fill                                 = root._fillColor.slice();
+                        shapeModel.fillMaterial                 = root._fillMaterial.dup();
+                                                shapeModel.innerRadius = root._innerRadius;
+                                                break;
+
+                                        case root.GEOM_TYPE_LINE:
+                        elementModel.selection = "Line";
+                        elementModel.pi = "LinePi";
+                                                shapeModel.slope = root._slope;
+                                                break;
+
+                                        default:
+                                                console.log( "geometry type not supported for file I/O, " + root.geomType());
+                                                break;
+                                }
                         }
                 }
-    },
+        },
 
     zoomFactor: {
         get: function() { return this._zoomFactor; },
@@ -240,6 +322,27 @@ exports.HTMLDocument = Montage.create(TextDocument, {
             }
         }
     },
+
+    /**
+     * search the DOM tree to find a canvas with the given id
+     */
+        findCanvasWithID:  {
+                value: function( id,  elt )  {
+                        var cid = elt.getAttribute( "data-RDGE-id" );
+                        if (cid == id)  return elt;
+
+                        if (elt.children)
+                        {
+                                var nKids = elt.children.length;
+                                for (var i=0;  i<nKids;  i++)
+                                {
+                                        var child = elt.children[i];
+                                        var foundElt = this.findCanvasWithID( id, child );
+                                        if (foundElt)  return foundElt;
+                                }
+                        }
+                }
+        },
     
     
     
@@ -437,8 +540,8 @@ exports.HTMLDocument = Montage.create(TextDocument, {
                         } else if (prop.indexOf('url') !== -1) { //From CSS property
                                 //TODO: Add functionality
                                 var docRootUrl = this.application.ninja.coreIoApi.rootUrl+escape((this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1]).replace(/\/\//gi, '/'));
-                                prop = prop.replace(/[^()\\""\\'']+/g, test);
-                                function test (s) {
+                                prop = prop.replace(/[^()\\""\\'']+/g, cssUrlToNinjaUrl);
+                                function cssUrlToNinjaUrl (s) {
                                         if (s !== 'url') {
                                                 s = docRootUrl + s;
                                         }
@@ -451,9 +554,12 @@ exports.HTMLDocument = Montage.create(TextDocument, {
             //
             function ninjaUrlPrepend (url) {
                 var docRootUrl = this.application.ninja.coreIoApi.rootUrl+escape((this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1]).replace(/\/\//gi, '/'));
-                return '"'+docRootUrl+url.replace(/\"/gi, '')+'"';
+                if (url.indexOf('data:image') !== -1) {
+                        return url;
+                } else {
+                        return '"'+docRootUrl+url.replace(/\"/gi, '')+'"';
+                }
             }
-            
                 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
                 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
                 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -570,8 +676,22 @@ exports.HTMLDocument = Montage.create(TextDocument, {
                                                                 }
                                                                 //
                                                                 fileCouldDirUrl = this._document.styleSheets[i].href.split(this._document.styleSheets[i].href.split('/')[this._document.styleSheets[i].href.split('/').length-1])[0];
-                                                                prefixUrl = 'url('+fileCouldDirUrl; //This should be re-written with better RegEx
-                                                                tag.innerHTML = cssData.content.replace(/url\(/gi, prefixUrl);
+                                                                
+                                                                tag.innerHTML = cssData.content.replace(/url\(()(.+?)\1\)/g, detectUrl);
+                                                                
+                                                                function detectUrl (prop) {
+