Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into working

53 files changed, 57 insertions, 2 deletions

diff --git a/assets/images/BasePlatformA01_AO.png b/assets/images/BasePlatformA01_AO.png
deleted file mode 100644
index 11f74245..00000000
--- a/assets/images/BasePlatformA01_AO.png
+++ /dev/null
diff --git a/assets/images/BasePlatformA01_DM.png b/assets/images/BasePlatformA01_DM.png
deleted file mode 100644
index f367ccb7..00000000
--- a/assets/images/BasePlatformA01_DM.png
+++ /dev/null
diff --git a/assets/images/BoxA01_AO.png b/assets/images/BoxA01_AO.png
deleted file mode 100644
index 60a88883..00000000
--- a/assets/images/BoxA01_AO.png
+++ /dev/null
diff --git a/assets/images/BoxA01_DM.png b/assets/images/BoxA01_DM.png
deleted file mode 100644
index cc6f6165..00000000
--- a/assets/images/BoxA01_DM.png
+++ /dev/null
diff --git a/assets/images/Grunge.png b/assets/images/Grunge.png
deleted file mode 100644
index 49ff48e9..00000000
--- a/assets/images/Grunge.png
+++ /dev/null
diff --git a/assets/images/LabelFrame.tga b/assets/images/LabelFrame.tga
deleted file mode 100644
index 7e3326bd..00000000
--- a/assets/images/LabelFrame.tga
+++ /dev/null
diff --git a/assets/images/MArmBaseN_DM.png b/assets/images/MArmBaseN_DM.png
deleted file mode 100644
index 6845b555..00000000
--- a/assets/images/MArmBaseN_DM.png
+++ /dev/null
diff --git a/assets/images/MArmBaseN_NM.png b/assets/images/MArmBaseN_NM.png
deleted file mode 100644
index 5009b0ec..00000000
--- a/assets/images/MArmBaseN_NM.png
+++ /dev/null
diff --git a/assets/images/MArmTopN_DM.png b/assets/images/MArmTopN_DM.png
deleted file mode 100644
index ef3511b3..00000000
--- a/assets/images/MArmTopN_DM.png
+++ /dev/null
diff --git a/assets/images/MArmTopN_NM.png b/assets/images/MArmTopN_NM.png
deleted file mode 100644
index 489c92db..00000000
--- a/assets/images/MArmTopN_NM.png
+++ /dev/null
diff --git a/assets/images/MArm_AO.png b/assets/images/MArm_AO.png
deleted file mode 100644
index be27c8cb..00000000
--- a/assets/images/MArm_AO.png
+++ /dev/null
diff --git a/assets/images/MBaseWallA01_AO.png b/assets/images/MBaseWallA01_AO.png
deleted file mode 100644
index d68e4209..00000000
--- a/assets/images/MBaseWallA01_AO.png
+++ /dev/null
diff --git a/assets/images/MBaseWallA01_DM.png b/assets/images/MBaseWallA01_DM.png
deleted file mode 100644
index 02a31e16..00000000
--- a/assets/images/MBaseWallA01_DM.png
+++ /dev/null
diff --git a/assets/images/MBaseWallA01_GM.png b/assets/images/MBaseWallA01_GM.png
deleted file mode 100644
index 726453ae..00000000
--- a/assets/images/MBaseWallA01_GM.png
+++ /dev/null
diff --git a/assets/images/MBase_AO.png b/assets/images/MBase_AO.png
deleted file mode 100644
index 12d763da..00000000
--- a/assets/images/MBase_AO.png
+++ /dev/null
diff --git a/assets/images/MCoreBase_DM.png b/assets/images/MCoreBase_DM.png
deleted file mode 100644
index 4d0ec6dd..00000000
--- a/assets/images/MCoreBase_DM.png
+++ /dev/null
diff --git a/assets/images/MCoreBase_GM.png b/assets/images/MCoreBase_GM.png
deleted file mode 100644
index 81d464ec..00000000
--- a/assets/images/MCoreBase_GM.png
+++ /dev/null
diff --git a/assets/images/MEjectorBaseN_DM.png b/assets/images/MEjectorBaseN_DM.png
deleted file mode 100644
index 1832c522..00000000
--- a/assets/images/MEjectorBaseN_DM.png
+++ /dev/null
diff --git a/assets/images/MEjectorBaseN_NM.png b/assets/images/MEjectorBaseN_NM.png
deleted file mode 100644
index 4f7560d3..00000000
--- a/assets/images/MEjectorBaseN_NM.png
+++ /dev/null
diff --git a/assets/images/MRingBaseN_DM.png b/assets/images/MRingBaseN_DM.png
deleted file mode 100644
index f8a4aebe..00000000
--- a/assets/images/MRingBaseN_DM.png
+++ /dev/null
diff --git a/assets/images/MRingBaseN_NM.png b/assets/images/MRingBaseN_NM.png
deleted file mode 100644
index c9242acb..00000000
--- a/assets/images/MRingBaseN_NM.png
+++ /dev/null
diff --git a/assets/images/MSquareBaseN_DM.png b/assets/images/MSquareBaseN_DM.png
deleted file mode 100644
index 5576eff0..00000000
--- a/assets/images/MSquareBaseN_DM.png
+++ /dev/null
diff --git a/assets/images/MWall_AO.png b/assets/images/MWall_AO.png
deleted file mode 100644
index e5d5a684..00000000
--- a/assets/images/MWall_AO.png
+++ /dev/null
diff --git a/assets/images/MWall_DM.png b/assets/images/MWall_DM.png
deleted file mode 100644
index b735de01..00000000
--- a/assets/images/MWall_DM.png
+++ /dev/null
diff --git a/assets/images/MWall_GM.png b/assets/images/MWall_GM.png
deleted file mode 100644
index 2cd56c3d..00000000
--- a/assets/images/MWall_GM.png
+++ /dev/null
diff --git a/assets/images/MWall_NM.png b/assets/images/MWall_NM.png
deleted file mode 100644
index 2650bc07..00000000
--- a/assets/images/MWall_NM.png
+++ /dev/null
diff --git a/assets/images/Ref.png b/assets/images/Ref.png
deleted file mode 100644
index 226e4200..00000000
--- a/assets/images/Ref.png
+++ /dev/null
diff --git a/assets/images/Spec.png b/assets/images/Spec.png
deleted file mode 100644
index 76658540..00000000
--- a/assets/images/Spec.png
+++ /dev/null
diff --git a/assets/images/black.tga b/assets/images/black.tga
deleted file mode 100644
index 69124ff0..00000000
--- a/assets/images/black.tga
+++ /dev/null
diff --git a/assets/images/cube.png b/assets/images/cube.png
deleted file mode 100644
index 6cb3ef82..00000000
--- a/assets/images/cube.png
+++ /dev/null
diff --git a/assets/images/cubelight_Glow.png b/assets/images/cubelight_Glow.png
deleted file mode 100644
index 4f8c922f..00000000
--- a/assets/images/cubelight_Glow.png
+++ /dev/null
diff --git a/assets/images/cubelight_spec.png b/assets/images/cubelight_spec.png
deleted file mode 100644
index 5cfe820b..00000000
--- a/assets/images/cubelight_spec.png
+++ /dev/null
diff --git a/assets/images/default_white.png b/assets/images/default_white.png
deleted file mode 100644
index cca49ba7..00000000
--- a/assets/images/default_white.png
+++ /dev/null
diff --git a/assets/images/droid.png b/assets/images/droid.png
deleted file mode 100644
index 9cba133e..00000000
--- a/assets/images/droid.png
+++ /dev/null
diff --git a/assets/images/env.png b/assets/images/env.png
deleted file mode 100644
index 72bba813..00000000
--- a/assets/images/env.png
+++ /dev/null
diff --git a/assets/images/femaleRobot.png b/assets/images/femaleRobot.png
deleted file mode 100644
index 30b153b4..00000000
--- a/assets/images/femaleRobot.png
+++ /dev/null
diff --git a/assets/images/femaleRobot_Glow.png b/assets/images/femaleRobot_Glow.png
deleted file mode 100644
index 1141f521..00000000
--- a/assets/images/femaleRobot_Glow.png
+++ /dev/null
diff --git a/assets/images/lightRack.png b/assets/images/lightRack.png
deleted file mode 100644
index 30b153b4..00000000
--- a/assets/images/lightRack.png
+++ /dev/null
diff --git a/assets/images/lightRack_Glow.png b/assets/images/lightRack_Glow.png
deleted file mode 100644
index 30b153b4..00000000
--- a/assets/images/lightRack_Glow.png
+++ /dev/null
diff --git a/assets/images/metal.png b/assets/images/metal.png
index d753bec4..ab36aaac 100644
--- a/assets/images/metal.png
+++ b/assets/images/metal.png
diff --git a/assets/images/particle-star.png b/assets/images/particle-star.png
deleted file mode 100644
index 7da25295..00000000
--- a/assets/images/particle-star.png
+++ /dev/null
diff --git a/assets/images/quilt01.png b/assets/images/quilt01.png
deleted file mode 100644
index 9c14865f..00000000
--- a/assets/images/quilt01.png
+++ /dev/null
diff --git a/assets/images/quilt01_E.png b/assets/images/quilt01_E.png
deleted file mode 100644
index 2dbafd27..00000000
--- a/assets/images/quilt01_E.png
+++ /dev/null
diff --git a/assets/images/quilt01_N.png b/assets/images/quilt01_N.png
deleted file mode 100644
index 801cd09d..00000000
--- a/assets/images/quilt01_N.png
+++ /dev/null
diff --git a/assets/images/quilt02.png b/assets/images/quilt02.png
deleted file mode 100644
index 4b1bf2ed..00000000
--- a/assets/images/quilt02.png
+++ /dev/null
diff --git a/assets/images/quilt02_E.png b/assets/images/quilt02_E.png
deleted file mode 100644
index 2dbafd27..00000000
--- a/assets/images/quilt02_E.png
+++ /dev/null
diff --git a/assets/images/quilt02_N.png b/assets/images/quilt02_N.png
deleted file mode 100644
index 136d1008..00000000
--- a/assets/images/quilt02_N.png
+++ /dev/null
diff --git a/assets/images/white.tga b/assets/images/white.tga
deleted file mode 100644
index a40a0a2b..00000000
--- a/assets/images/white.tga
+++ /dev/null
diff --git a/index.html b/index.html
index 44f8ec7e..f3018823 100644
--- a/index.html
+++ b/index.html
@@ -168,11 +168,31 @@
                 
                 <script type="text/javascript">
                         window.onload = function() {
+                // Check if we are running in Chrome
+                if(navigator.userAgent.toLowerCase().indexOf("chrome") === -1) {
+                    window.location = "./redirect.html";
+                }
+                // Load the version json
+                var req = new XMLHttpRequest();
+                req.open("GET", "versions.json");
+                req.onreadystatechange = (function(req) {
+                    return function(event) {
+                        if (req.readyState === 4) {
+                            if (req.status === 200) {
+                                window.ninjaVersion = JSON.parse(req.responseText);
+                            } else {
+                                console.log("Ninja version file could not be loaded");
+                            }
+                        }
+                    }
+                })(req);
+                req.send();
                                 //
                                 var star = document.getElementById('star');
                                 //
                                 njstar(star.getContext("2d"));
-                        }
+                        };
+
                         function njstar (ctx) {
                                 ctx.save();
                                 ctx.translate(0,0);
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js
index bc31e0e1..465533cd 100644
--- a/js/ninja.reel/ninja.js
+++ b/js/ninja.reel/ninja.js
@@ -13,6 +13,10 @@ exports.Ninja = Montage.create(Component, {
     _appLoaded: { value: false },
     _preload: { value: false },
 
+    ninjaVersion: {
+        value: window.ninjaVersion.ninja.version
+    },
+
     toolsData: { value: null },
     appData:    { value: AppData },
 
@@ -36,6 +40,7 @@ exports.Ninja = Montage.create(Component, {
 
     prepareForDraw: {
         value: function() {
+            console.log("Loading Ninja --> ", this.ninjaVersion);
 
             this.application.ninja = this;
 
diff --git a/js/preloader/Preloader.js b/js/preloader/Preloader.js
index 4a4ac019..3daeb1b4 100755
--- a/js/preloader/Preloader.js
+++ b/js/preloader/Preloader.js
@@ -135,7 +135,6 @@ exports.Preloader = Montage.create(Component, {
 
     deserializedFromTemplate: {
         value: function() {
-            console.log("Start Preloading");
 
             this.filesTotal = this.ninjaJsRequire.length + this.ninjaCssRequire.length;
 
diff --git a/redirect.html b/redirect.html
new file mode 100644
index 00000000..cf602f58
--- /dev/null
+++ b/redirect.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<!-- <copyright>
+ This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+ (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+ </copyright> -->
+<html>