diff --git a/packages/autoupdate/autoupdate_cordova.js b/packages/autoupdate/autoupdate_cordova.js
index c483e13fd2..ba3257c8ee 100644
--- a/packages/autoupdate/autoupdate_cordova.js
+++ b/packages/autoupdate/autoupdate_cordova.js
@@ -41,7 +41,6 @@ var onNewVersion = function (handle) {
// save the manifest
uri = encodeURI(urlPrefix + '/manifest.json');
ft.download(uri, localPathPrefix + '/manifest.json', function () {
- console.log('done');
Package.reload.Reload._reload();
});
}
diff --git a/packages/boilerplate-generator/boilerplate-generator.js b/packages/boilerplate-generator/boilerplate-generator.js
index df6582ec54..a3c085642e 100644
--- a/packages/boilerplate-generator/boilerplate-generator.js
+++ b/packages/boilerplate-generator/boilerplate-generator.js
@@ -50,7 +50,8 @@ Boilerplate.prototype._generateBoilerplateFromManifestAndSource =
css: [],
js: [],
head: '',
- body: ''
+ body: '',
+ meteorManifest: JSON.stringify(manifest)
};
// allow the caller to extend the default base data
diff --git a/packages/boilerplate-generator/boilerplate_web.cordova.html b/packages/boilerplate-generator/boilerplate_web.cordova.html
index d271e5a026..6cf5ceeafe 100644
--- a/packages/boilerplate-generator/boilerplate_web.cordova.html
+++ b/packages/boilerplate-generator/boilerplate_web.cordova.html
@@ -5,41 +5,25 @@
- {{#each css}}
- {{#if inline}}
-
- {{else}}
-
- {{/if}}
- {{/each}}
-
- {{#if includeCordova}}
-
- {{/if}}
-
- {{#each js}}
- {{#if inline}}
-
- {{else}}
-
- {{/if}}
- {{/each}}
-
+
{{{head}}}
-
+
{{{body}}}
diff --git a/tools/client/meteor_cordova_loader.js b/tools/client/meteor_cordova_loader.js
index fe85f24892..36038a3205 100644
--- a/tools/client/meteor_cordova_loader.js
+++ b/tools/client/meteor_cordova_loader.js
@@ -39,6 +39,7 @@
var COUNTER = 0;
var loadScript = function (url) {
+ console.log('loadscript ' + url)
var scriptTag = document.createElement('script');
scriptTag.type = "text/javascript";
scriptTag.src = url;
@@ -52,12 +53,26 @@
};
var loadStyle = function (url) {
- var scriptTag = document.createElement('link');
- scriptTag.rel = "stylesheet";
- scriptTag.type = "text/css";
- scriptTag.href = url;
- scriptTag.type = "text/javascript";
- document.getElementsByTagName('head')[0].appendChild(scriptTag);
+ var styleTag = document.createElement('link');
+ styleTag.rel = "stylesheet";
+ styleTag.type = "text/css";
+ styleTag.href = url;
+ document.getElementsByTagName('head')[0].appendChild(styleTag);
+ };
+
+ var loadAssetsFromManifest = function (manifest, urlPrefix) {
+ each(manifest, function (item) {
+ if (item.type === 'js') {
+ COUNTER++;
+ }
+ });
+
+ each(manifest, function (item) {
+ if (item.type === 'js')
+ loadScript(urlPrefix + item.url.substring(1));
+ else if (item.type === 'css')
+ loadStyle(urlPrefix + item.url.substring(1));
+ });
};
document.addEventListener("deviceready", function () {
@@ -66,26 +81,15 @@
function (err, res) {
if (! err) {
var manifest = JSON.parse(res).manifest;
-
- each(manifest, function (item) {
- if (item.type==='js')
- COUNTER++;
- });
-
- each(manifest, function (item) {
- if (item.type === 'js')
- loadScript(localPathPrefix + item.url);
- else if (item.type === 'css')
- loadStyle(localPathPrefix + item.url);
- });
+ loadAssetsFromManifest(manifest, localPathPrefix + '/');
} else {
// We don't have any new versions, default to the bundled assets.
console.log(err.message);
console.log('Couldn\'t load from the manifest, falling back to the bundled assets.');
- }
- loadScript('document.dispatchEvent(evt);', true);
- document.getElementsByTagName('body')[0].removeAttribute('style'); // XXX remove this?
+ loadAssetsFromManifest(__meteor_manifest__, '');
+ }
});
}, false);
})();
+