diff options
| author | Eric Guzman | 2012-04-05 18:42:40 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-04-05 18:42:40 -0700 |
| commit | 8ff9dde2053e41d85bb27d9c91808a30e551a138 (patch) | |
| tree | 8eec67d632d82d3052ed470096eda13fd50a55c8 | |
| parent | 4631d54ffb4942378835689e9f5d70ed95610822 (diff) | |
| parent | 7656b6eac7aec59697c6cddbe2a507fe9e4aa187 (diff) | |
| download | ninja-8ff9dde2053e41d85bb27d9c91808a30e551a138.tar.gz | |
Merge branch 'refs/heads/master' into CSSPanelUpdates
108 files changed, 11514 insertions, 15132 deletions
| @@ -20,4 +20,5 @@ cloud/ | |||
| 20 | /.idea/scopes/scope_settings.xml | 20 | /.idea/scopes/scope_settings.xml |
| 21 | compass_app_log.txt | 21 | compass_app_log.txt |
| 22 | js/io/ui/cloudpopup.reel/.sass-cache/5fd824121af95f6044b06681535cf0639ffb5db3/cloudpopup.scssc | 22 | js/io/ui/cloudpopup.reel/.sass-cache/5fd824121af95f6044b06681535cf0639ffb5db3/cloudpopup.scssc |
| 23 | scss/.sass-cache/ \ No newline at end of file | 23 | scss/.sass-cache/ |
| 24 | js/helper-classes/RDGE/src/tools/compiler.jar | ||
diff --git a/assets/canvas-runtime.js b/assets/canvas-runtime.js index f53a4ef6..a35f473d 100644 --- a/assets/canvas-runtime.js +++ b/assets/canvas-runtime.js | |||
| @@ -4,11 +4,12 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | 4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. |
| 5 | </copyright> */ | 5 | </copyright> */ |
| 6 | 6 | ||
| 7 | 7 | // namespace for the Ninja Canvas Runtime | |
| 8 | var NinjaCvsRt = NinjaCvsRt || {}; | ||
| 8 | 9 | ||
| 9 | /////////////////////////////////////////////////////////////////////// | 10 | /////////////////////////////////////////////////////////////////////// |
| 10 | //Loading webGL/canvas data | 11 | //Loading webGL/canvas data |
| 11 | function initWebGl (rootElement, directory) { | 12 | NinjaCvsRt.initWebGl = function (rootElement, directory) { |
| 12 | var cvsDataMngr, ninjaWebGlData = JSON.parse((document.querySelectorAll(['script[data-ninja-webgl]'])[0].innerHTML.replace('(', '')).replace(')', '')); | 13 | var cvsDataMngr, ninjaWebGlData = JSON.parse((document.querySelectorAll(['script[data-ninja-webgl]'])[0].innerHTML.replace('(', '')).replace(')', '')); |
| 13 | if (ninjaWebGlData && ninjaWebGlData.data) { | 14 | if (ninjaWebGlData && ninjaWebGlData.data) { |
| 14 | for (var n=0; ninjaWebGlData.data[n]; n++) { | 15 | for (var n=0; ninjaWebGlData.data[n]; n++) { |
| @@ -16,16 +17,16 @@ function initWebGl (rootElement, directory) { | |||
| 16 | } | 17 | } |
| 17 | } | 18 | } |
| 18 | //Creating data manager | 19 | //Creating data manager |
| 19 | cvsDataMngr = new CanvasDataManager(); | 20 | cvsDataMngr = new NinjaCvsRt.CanvasDataManager(); |
| 20 | //Loading data to canvas(es) | 21 | //Loading data to canvas(es) |