diff options
| author | zefanja <zefanja@freenet.de> | 2013-08-07 14:35:55 +0700 |
|---|---|---|
| committer | zefanja <zefanja@freenet.de> | 2013-08-07 14:35:55 +0700 |
| commit | 7358d6c56001eadcde30e81cf41ccc658c065a7c (patch) | |
| tree | 8be9d9fa62d7120bc78f545bdabe997213ac7d19 | |
| parent | 4671928507af7dac207d4a20ea9b6c296d4c799d (diff) | |
| download | biblez-ng-7358d6c56001eadcde30e81cf41ccc658c065a7c.tar.gz | |
* added work around for FxOS's CSP rules
* added description to manifest files for systemXHR
| -rwxr-xr-x | buildApp.sh | 2 | ||||
| -rw-r--r-- | debug.html | 3 | ||||
| m--------- | enyo | 0 | ||||
| -rw-r--r-- | index.html | 7 | ||||
| m--------- | lib/layout | 0 | ||||
| m--------- | lib/onyx | 0 | ||||
| m--------- | lib/sword | 0 | ||||
| -rw-r--r-- | manifest.deploy | 4 | ||||
| -rw-r--r-- | manifest.webapp | 4 | ||||
| -rw-r--r-- | source/App.js | 7 |
10 files changed, 14 insertions, 13 deletions
diff --git a/buildApp.sh b/buildApp.sh index 7d028d5..615320b 100755 --- a/buildApp.sh +++ b/buildApp.sh @@ -1,3 +1,3 @@ #!/bin/sh sh tools/deploy.sh -cp manifest.deploy deploy/biblez-enyo/manifest.webapp +cp manifest.deploy deploy/biblez-ng/manifest.webapp @@ -16,8 +16,5 @@ <script src="source/package.js" charset="utf-8"></script> </head> <body class="enyo-unselectable"> - <script> - new App().renderInto(document.body); - </script> </body> </html> diff --git a/enyo b/enyo -Subproject 5417c8fe7e2ffa7154dc3e7e67612858d0923cd +Subproject b8969bc24d1da4aa74e069c3c4cbc0315082fbf @@ -16,12 +16,5 @@ <script src="build/app.js" charset="utf-8"></script> </head> <body class="enyo-unselectable"> - <script> - if (!window.App) { - alert('No application build found, redirecting to debug.html.'); - location = 'debug.html'; - } - new App().renderInto(document.body); - </script> </body> </html> diff --git a/lib/layout b/lib/layout -Subproject 1ba8f591ceedcca87ff461f35397478bf25f7c4 +Subproject b7ab2eac47f7a1da1abe69587f7a8558d5220e0 diff --git a/lib/onyx b/lib/onyx -Subproject 7ff3005b5b5e59bc0f9f3b3bd738c6019c12a83 +Subproject b97f9f45a4cafd21f7179aafbf8b6406ad99419 diff --git a/lib/sword b/lib/sword -Subproject 0468165e03e818e974164051aae391942e2121f +Subproject 20b5c5aad22746f8fb05fb2efd7346ba3bd19d5 diff --git a/manifest.deploy b/manifest.deploy index 2d09b6b..829bc16 100644 --- a/manifest.deploy +++ b/manifest.deploy @@ -12,6 +12,8 @@ "default_locale": "en", "type": "privileged", "permissions": { - "systemXHR": {} + "systemXHR": { + "description": "Required to download CrossWire's bible modules" + } } }
\ No newline at end of file diff --git a/manifest.webapp b/manifest.webapp index 2e7ae68..7b56689 100644 --- a/manifest.webapp +++ b/manifest.webapp @@ -12,6 +12,8 @@ "default_locale": "en", "type": "privileged", "permissions": { - "systemXHR": {} + "systemXHR": { + "description": "Required to download CrossWire's bible modules" + } } }
\ No newline at end of file diff --git a/source/App.js b/source/App.js index b5a7ff0..0f75cb0 100644 --- a/source/App.js +++ b/source/App.js @@ -1,3 +1,10 @@ +enyo.ready(function() { + if (!window.App) { + alert('No application build found, please open debug.html.'); + } + new App().renderInto(document.body); +}); + enyo.kind({ name: "App", kind: enyo.FittableRows, |