diff options
author | Jose Antonio Marquez | 2012-03-16 21:03:58 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-03-16 21:03:58 -0700 |
commit | 415bab69cca4e8511144407b67bec80f2ba95422 (patch) | |
tree | c336ca8ae1bcd6761c924bacf8bfe7143b2c7885 /js/document | |
parent | e7e18f02870a0cfe06e550acf8ffef6eab945231 (diff) | |
parent | 954f5a13e371febcb1c0fb8015c577ee51c23130 (diff) | |
download | ninja-415bab69cca4e8511144407b67bec80f2ba95422.tar.gz |
Merge branch 'refs/heads/Ninja-Internal' into Document
Diffstat (limited to 'js/document')
-rwxr-xr-x | js/document/html-document.js | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/js/document/html-document.js b/js/document/html-document.js index 051490f5..d4db6e2f 100755 --- a/js/document/html-document.js +++ b/js/document/html-document.js | |||
@@ -207,9 +207,18 @@ exports.HTMLDocument = Montage.create(TextDocument, { | |||
207 | }, | 207 | }, |
208 | set: function(value) { | 208 | set: function(value) { |
209 | var elt = this.documentRoot; | 209 | var elt = this.documentRoot; |
210 | if (elt) { | 210 | if (elt) |
211 | { | ||
211 | var nWorlds= value.length; | 212 | var nWorlds= value.length; |
212 | for (var i=0; i<nWorlds; i++) { | 213 | for (var i=0; i<nWorlds; i++) |
214 | { | ||
215 | /* | ||
216 | // Use this code to test the runtime version of WebGL | ||
217 | var cdm = new CanvasDataManager(); | ||
218 | cdm.loadGLData(elt, value, null ); | ||
219 | */ | ||
220 | |||
221 | // /* | ||
213 | var importStr = value[i]; | 222 | var importStr = value[i]; |
214 | var startIndex = importStr.indexOf( "id: " ); | 223 | var startIndex = importStr.indexOf( "id: " ); |
215 | if (startIndex >= 0) { | 224 | if (startIndex >= 0) { |
@@ -236,6 +245,7 @@ exports.HTMLDocument = Montage.create(TextDocument, { | |||
236 | } | 245 | } |
237 | } | 246 | } |
238 | } | 247 | } |
248 | // */ | ||
239 | } | 249 | } |
240 | } | 250 | } |
241 | } | 251 | } |