Merge branch 'refs/heads/NINJAmaster' into TimelineUber

94 files changed, 11511 insertions, 14797 deletions

diff --git a/.gitignore b/.gitignore
index 40248468..6192b556 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,4 +20,5 @@ cloud/
 /.idea/scopes/scope_settings.xml
 compass_app_log.txt
 js/io/ui/cloudpopup.reel/.sass-cache/5fd824121af95f6044b06681535cf0639ffb5db3/cloudpopup.scssc
-scss/.sass-cache/
\ No newline at end of file
+scss/.sass-cache/
+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
 (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
 </copyright> */
 
-
+// namespace for the Ninja Canvas Runtime
+var NinjaCvsRt =  NinjaCvsRt || {};
 
 ///////////////////////////////////////////////////////////////////////
 //Loading webGL/canvas data
-function initWebGl (rootElement, directory) {
+NinjaCvsRt.initWebGl = function (rootElement, directory) {
         var cvsDataMngr, ninjaWebGlData = JSON.parse((document.querySelectorAll(['script[data-ninja-webgl]'])[0].innerHTML.replace('(', '')).replace(')', ''));
         if (ninjaWebGlData && ninjaWebGlData.data) {
                 for (var n=0; ninjaWebGlData.data[n]; n++) {
@@ -16,16 +17,16 @@ function initWebGl (rootElement, directory) {
                 }
         }
         //Creating data manager
-        cvsDataMngr = new CanvasDataManager();
+        cvsDataMngr = new NinjaCvsRt.CanvasDataManager();
         //Loading data to canvas(es)
         cvsDataMngr.loadGLData(rootElement, ninjaWebGlData.data, directory);
-}
+};
 
 ///////////////////////////////////////////////////////////////////////
 // Class ShapeRuntime
 //      Manages runtime shape display
 ///////////////////////////////////////////////////////////////////////
-function CanvasDataManager()
+NinjaCvsRt.CanvasDataManager = function () 
 {
         this.loadGLData = function(root,  valueArray,  assetPath )
         {
@@ -54,31 +55,12 @@ function CanvasDataManager()
                                         var canvas = this.findCanvasWithID( id, root );
                                         if (canvas)
                                         {
-                                                new GLRuntime( canvas, jObj,  assetPath );
+                                                new NinjaCvsRt.GLRuntime( canvas, jObj,  assetPath );
                                         }
                                 }