aboutsummaryrefslogtreecommitdiff
path: root/js/document/html-document.js
diff options
context:
space:
mode:
authorJonathan Duran2012-05-24 09:35:02 -0700
committerJonathan Duran2012-05-24 09:35:02 -0700
commit458714f5bf2ab095f6e96dfec3f9ff7042527c04 (patch)
tree779ba55d14f059572cb81d27024ca8b8a92956e0 /js/document/html-document.js
parent2e4831cf0fe04f37a179f84b098ae0899d4e40b8 (diff)
parent862ee363584dfba4bdd9abacbc3a3244c7ec66b5 (diff)
downloadninja-458714f5bf2ab095f6e96dfec3f9ff7042527c04.tar.gz
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js/document/html-document.js')
-rwxr-xr-xjs/document/html-document.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/js/document/html-document.js b/js/document/html-document.js
index 9d083dd8..61223499 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -209,8 +209,8 @@ exports.HTMLDocument = Montage.create(TextDocument, {
209 { 209 {
210 /* 210 /*
211 // Use this code to test the runtime version of WebGL 211 // Use this code to test the runtime version of WebGL
212 var cdm = new NinjaCvsRt.CanvasDataManager(); 212 var cvsDataMngr = Object.create(NinjaCvsRt.CanvasDataManager, {});
213 cdm.loadGLData(elt, value, null ); 213 cvsDataMngr.loadGLData(elt, value);
214 */ 214 */
215 215
216 // /* 216 // /*