aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-02-08 14:59:53 -0800
committerNivesh Rajbhandari2012-02-08 14:59:53 -0800
commit64524c693e09646a0db05d772311247a56194ac9 (patch)
tree93b3ceac904abf190e2a77198dbde56856eb4bc0
parent72805efb66c372bec2df8a2686dfd56c9ed26622 (diff)
parent0537f8f29e7b8dd48fd08f20b1533fbe92a54c4b (diff)
downloadninja-64524c693e09646a0db05d772311247a56194ac9.tar.gz
Merge branch 'refs/heads/ninja-internal' into ToolFixes
-rw-r--r--index.html40
-rw-r--r--manifest.json25
-rw-r--r--ninja_icon_128.pngbin0 -> 8742 bytes
-rw-r--r--versions.json8
4 files changed, 52 insertions, 21 deletions
diff --git a/index.html b/index.html
index f3018823..53bd6605 100644
--- a/index.html
+++ b/index.html
@@ -172,21 +172,35 @@
172 if(navigator.userAgent.toLowerCase().indexOf("chrome") === -1) { 172 if(navigator.userAgent.toLowerCase().indexOf("chrome") === -1) {
173 window.location = "./redirect.html"; 173 window.location = "./redirect.html";
174 } 174 }
175 // Load the version json 175 window.ninjaVersion = {};
176 var req = new XMLHttpRequest(); 176 window.ninjaVersion.ninja = {};
177 req.open("GET", "versions.json"); 177 if (window.chrome.app.isInstalled) {
178 req.onreadystatechange = (function(req) { 178 // Ninja is running as an installed app, started via the app launcher.
179 return function(event) { 179 var info = chrome.app.getDetails();
180 if (req.readyState === 4) { 180 if(info) {
181 if (req.status === 200) { 181 window.ninjaVersion.ninja.version = info.version;
182 window.ninjaVersion = JSON.parse(req.responseText); 182 }
183 } else { 183 } else {
184 console.log("Ninja version file could not be loaded"); 184 // Ninja is running via a bookmark/link as a hosted web application.
185 // Load the version json
186 var req = new XMLHttpRequest();
187 req.open("GET", "manifest.json");
188 req.onreadystatechange = (function(req) {
189 return function(event) {
190 if (req.readyState === 4) {
191 if (req.status === 200) {
192 var manifestInfo = JSON.parse(req.responseText);
193 if(manifestInfo) {
194 window.ninjaVersion.ninja.version = manifestInfo.version;
195 }
196 } else {
197 console.log("Ninja version file could not be loaded");
198 }
185 } 199 }
186 } 200 }
187 } 201 })(req);
188 })(req); 202 req.send();
189 req.send(); 203 }
190 // 204 //
191 var star = document.getElementById('star'); 205 var star = document.getElementById('star');
192 // 206 //
diff --git a/manifest.json b/manifest.json
new file mode 100644
index 00000000..12047172
--- /dev/null
+++ b/manifest.json
@@ -0,0 +1,25 @@
1{
2 "name": "Motorola Ninja",
3 "description": "Motorola Ninja HTML5 Authoring Tool Pre-Alpha",
4 "version": "0.5.0.0",
5 "app": {
6 "launch": {
7 "local_path": "index.html"
8 }
9 },
10 "icons": {
11 "128": "ninja_icon_128.png"
12 },
13 "permissions": [
14 "unlimitedStorage",
15 "notifications"
16 ],
17 "requirements": {
18 "3D": {
19 "features": ["css3d", "webgl"]
20 }
21 },
22 "minimum_chrome_version": "16.0.0.0",
23 "offline_enabled": true,
24 "update_url": "http://tetsubo.org/go/ninjaupdate"
25} \ 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
Binary files differ
diff --git a/versions.json b/versions.json
deleted file mode 100644
index 017e22ce..00000000
--- a/versions.json
+++ /dev/null
@@ -1,8 +0,0 @@
1{
2 "ninja": {
3 "version": "0.5.5"
4 },
5 "montage": {
6 "version": "0.6.0"
7 }
8} \ No newline at end of file