diff options
| author | Valerio Virgillito | 2012-05-22 14:54:51 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-05-22 14:54:51 -0700 |
| commit | 3493df6f1b1eaa20bb4f391e19c19bb7f3c872a0 (patch) | |
| tree | d0ca79f7a7be334d2a0580553bd9de3ba0bbe30b /js/document | |
| parent | b3e85f609f704d668c8022c53418f8056bc71260 (diff) | |
| parent | 862ee363584dfba4bdd9abacbc3a3244c7ec66b5 (diff) | |
| download | ninja-3493df6f1b1eaa20bb4f391e19c19bb7f3c872a0.tar.gz | |
Merge branch 'refs/heads/master' into dom-architecture
Conflicts:
js/io/system/ninjalibrary.json
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/document')
| -rwxr-xr-x | js/document/html-document.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/document/html-document.js b/js/document/html-document.js index bcf2b5c2..447d90e3 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 | // /* |