aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorJohn Mayhew2012-04-03 12:55:54 -0700
committerJohn Mayhew2012-04-03 12:55:54 -0700
commitd5d4dcac78ebf8ba3163a8c7055d783b6397a435 (patch)
tree9ec8586f19f6d238a4731f2b3ac76c3fe9572815 /js
parent9fdbfe3ab750e8f6dae2ae80ebb6728a4b6c985d (diff)
downloadninja-d5d4dcac78ebf8ba3163a8c7055d783b6397a435.tar.gz
Namespaced the canvas runtime file and updated all dependencies
Diffstat (limited to 'js')
-rwxr-xr-xjs/document/html-document.js2
-rw-r--r--js/mediators/io-mediator.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/js/document/html-document.js b/js/document/html-document.js
index 42a7d537..c9887b88 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -212,7 +212,7 @@ exports.HTMLDocument = Montage.create(TextDocument, {
212 { 212 {
213 /* 213 /*
214 // Use this code to test the runtime version of WebGL 214 // Use this code to test the runtime version of WebGL
215 var cdm = new CanvasDataManager(); 215 var cdm = new NinjaCvsRt.CanvasDataManager();
216 cdm.loadGLData(elt, value, null ); 216 cdm.loadGLData(elt, value, null );
217 */ 217 */
218 218
diff --git a/js/mediators/io-mediator.js b/js/mediators/io-mediator.js
index 1efbb8bb..82bb31c4 100644
--- a/js/mediators/io-mediator.js
+++ b/js/mediators/io-mediator.js
@@ -440,7 +440,7 @@ window.addEventListener('load', loadWebGL, false);\n\
440function loadWebGL (e) {\n\ 440function loadWebGL (e) {\n\
441 window.removeEventListener('load', loadWebGL, false);\n\ 441 window.removeEventListener('load', loadWebGL, false);\n\
442 //Calling method to initialize all webGL/canvas(es)\n\ 442 //Calling method to initialize all webGL/canvas(es)\n\
443 initWebGl("+rootElement+", '"+rdgeDirName+"/');\n\ 443 NinjaCvsRt.initWebGl(" + rootElement + ", '" + rdgeDirName + "/');\n\
444}\ 444}\
445 "; 445 ";
446 //TODO: This data should be saved to a JSON file eventually 446 //TODO: This data should be saved to a JSON file eventually