diff options
| author | Jose Antonio Marquez | 2012-03-26 15:36:49 -0700 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-03-26 15:36:49 -0700 |
| commit | 7bf738bc08f6a24edce30dbc2b101a8cab2d27aa (patch) | |
| tree | af3b114d6a83ae62dfcead8bd61bc62efe0c9516 | |
| parent | d87cded11dcc0faf41a4a3e6b587e5549c0da6df (diff) | |
| parent | 309dde5a8c4599cef6a1052c1ff9ee1ad8ec5858 (diff) | |
| download | ninja-7bf738bc08f6a24edce30dbc2b101a8cab2d27aa.tar.gz | |
Merge branch 'refs/heads/Ninja-Internal' into FileIO
124 files changed, 5562 insertions, 856 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() | |||
| 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 | |