Merge branch 'refs/heads/NinjaInternal' into FileIO

Conflicts:
	_scss/compass_app_log.txt
	_scss/imports/scss/_Stage.scss

1 files changed, 17 insertions, 1 deletions

diff --git a/index.html b/index.html
index ba2f70f8..f12c9d90 100755
--- a/index.html
+++ b/index.html
@@ -169,11 +169,27 @@
                 
                 <script type="text/javascript">
                         window.onload = function() {
+                // 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);