125 files changed, 5624 insertions, 927 deletions
diff --git a/assets/canvas-runtime.js b/assets/canvas-runtime.js
index fd823f35..dd909e26 100644
--- a/assets/canvas-runtime.js
+++ b/assets/canvas-runtime.js
@@ -37,17 +37,24 @@ function CanvasDataManager()
                for (var i=0;  i<nWorlds;  i++)
                {
                        var importStr = value[i];
-                        var startIndex = importStr.indexOf( "id: " );
-                        if (startIndex >= 0)
+                        // there should be some version information in
+                        // the form of 'v0.0;'  Pull that off.  (the trailing ';' should
+                        // be in the first 24 characters).
+                        var index = importStr.indexOf( ';' );
+                        if ((importStr[0] === 'v') && (index < 24))
                        {
-                                var endIndex = importStr.indexOf( "\n", startIndex );
+                                // JSON format.  pull off the version info
-                                if (endIndex > 0)
+                                importStr = importStr.substr( index+1 );
+                                var jObj = JSON.parse( importStr );
+                                var id = jObj.id;
+                                if (id)
                                {
-                                        var id = importStr.substring( startIndex+4, endIndex );
                                        var canvas = this.findCanvasWithID( id, root );
                                        if (canvas)

diff --git a/assets/canvas-runtime.js b/assets/canvas-runtime.js index fd823f35..dd909e26 100644 --- a/assets/canvas-runtime.js +++ b/assets/canvas-runtime.js
@@ -37,17 +37,24 @@ function CanvasDataManager()
37	for (var i=0; i<nWorlds; i++)	37	for (var i=0; i<nWorlds; i++)
38	{	38	{
39	var importStr = value[i];	39	var importStr = value[i];
40	var startIndex = importStr.indexOf( "id: " );	40
41	if (startIndex >= 0)	41	// there should be some version information in
		42	// the form of 'v0.0;' Pull that off. (the trailing ';' should
		43	// be in the first 24 characters).
		44	var index = importStr.indexOf( ';' );
		45	if ((importStr[0] === 'v') && (index < 24))
42	{	46	{
43	var endIndex = importStr.indexOf( "\n", startIndex );	47	// JSON format. pull off the version info
44	if (endIndex > 0)	48	importStr = importStr.substr( index+1 );
		49
		50	var jObj = JSON.parse( importStr );
		51	var id = jObj.id;
		52	if (id)
45	{	53	{
46	var id = importStr.substring( startIndex+4, endIndex );
47	var canvas = this.findCanvasWithID( id, root );	54	var canvas = this.findCanvasWithID( id, root );
48	if (canvas)	55	if (canvas)