aboutsummaryrefslogtreecommitdiff
path: root/js/document
diff options
context:
space:
mode:
authorPushkar Joshi2012-03-16 11:52:13 -0700
committerPushkar Joshi2012-03-16 11:52:13 -0700
commit1da989027e46102a9dc2aa2b5d764f58b97aa31b (patch)
tree496b8c7952c01b2caae76dda901b4173eedb11d2 /js/document
parente574f722864a246bad40d3f5a4e59f7ccb206ea9 (diff)
parent3e98d9eaf6f691aa0f7a4334983537a4ee3ffd39 (diff)
downloadninja-1da989027e46102a9dc2aa2b5d764f58b97aa31b.tar.gz
Merge branch 'master' into brushtool
Diffstat (limited to 'js/document')
-rwxr-xr-xjs/document/html-document.js14
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 }