Merge branch 'refs/heads/NinjaInternal' into FileIO

Conflicts:
	manifest.json

4 files changed, 50 insertions, 34 deletions

diff --git a/index.html b/index.html
index 2fbf524a..de1d0b2e 100755
--- a/index.html
+++ b/index.html
@@ -125,21 +125,35 @@
                 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");
+                window.ninjaVersion = {};
+                window.ninjaVersion.ninja = {};
+                if (window.chrome.app.isInstalled) {
+                    // Ninja is running as an installed app, started via the app launcher.
+                    var info = chrome.app.getDetails();
+                    if(info) {
+                        window.ninjaVersion.ninja.version = info.version;
+                    }
+                } else {
+                    // Ninja is running via a bookmark/link as a hosted web application.
+                    // Load the version json
+                    var req = new XMLHttpRequest();
+                    req.open("GET", "manifest.json");
+                    req.onreadystatechange = (function(req) {
+                        return function(event) {
+                            if (req.readyState === 4) {
+                                if (req.status === 200) {
+                                    var manifestInfo = JSON.parse(req.responseText);
+                                    if(manifestInfo) {
+                                        window.ninjaVersion.ninja.version = manifestInfo.version;
+                                    }
+                                } else {
+                                    console.log("Ninja version file could not be loaded");
+                                }
                             }
                         }
-                    }
-                })(req);
-                req.send();
+                    })(req);
+                    req.send();
+                }
                                 //
                                 var star = document.getElementById('star');
                                 //
diff --git a/manifest.json b/manifest.json
index 0ffea9b0..12047172 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,15 +1,25 @@
 {
-        "name": "Motorola Mobility Ninja",
-        "description": "Local Development Version",
-        "version": "0.0",
-        "icons": {"128": "ninja_icon.png"},
-        "app": {
-                "launch": {"local_path": "index.html"}
-        },
-        "permissions": ["unlimitedStorage"],
-        "requirements": { 
-                "3D": {
-                "features": ["css3d", "webgl"]
-                }
-        }
+  "name": "Motorola Ninja",
+  "description": "Motorola Ninja HTML5 Authoring Tool Pre-Alpha",
+  "version": "0.5.0.0",
+  "app": {
+    "launch": {
+      "local_path": "index.html"
+    }
+  },
+  "icons": {
+    "128": "ninja_icon_128.png"
+  },
+  "permissions": [
+    "unlimitedStorage",
+    "notifications"
+  ],
+  "requirements": {
+    "3D": {
+      "features": ["css3d", "webgl"]
+    }
+  },
+  "minimum_chrome_version": "16.0.0.0",
+  "offline_enabled": true,
+  "update_url": "http://tetsubo.org/go/ninjaupdate"
 }
\ No newline at end of file
diff --git a/ninja_icon_128.png b/ninja_icon_128.png
new file mode 100644
index 00000000..6f609f4a
--- /dev/null
+++ b/ninja_icon_128.png
diff --git a/versions.json b/versions.json
deleted file mode 100644
index 017e22ce..00000000
--- a/versions.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "ninja": {
-        "version": "0.5.5"
-    },
-    "montage": {
-        "version": "0.6.0"
-    }
-}
\ No newline at end of file