diff options
author | Eric Guzman | 2012-05-22 15:57:23 -0700 |
---|---|---|
committer | Eric Guzman | 2012-05-22 15:57:23 -0700 |
commit | ad3b4595d7377e5bf75bcb8ad81007859b0a8a02 (patch) | |
tree | ecb7fe289824a625b1dc422a97c2236826081ec3 /js/document/html-document.js | |
parent | 0eb95ff2dbba1fe7213eed2e0140b4d07bda3dd5 (diff) | |
parent | 2b207ef8b2594927f8cd6cd63a8483d205cb86c4 (diff) | |
download | ninja-ad3b4595d7377e5bf75bcb8ad81007859b0a8a02.tar.gz |
Merge branch 'dom-architecture' of github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates
Conflicts:
js/controllers/styles-controller.js
Diffstat (limited to 'js/document/html-document.js')
-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 | // /* |