From 6bbffaae5ad15dbd76dfdf9a237ef21a6f91036f Mon Sep 17 00:00:00 2001 From: Slava Kim Date: Mon, 8 Sep 2014 18:06:03 -0700 Subject: [PATCH] wip: try to get logging back. try to hot code push --- .../boilerplate_web.cordova.html | 17 ++- packages/logging/logging_cordova.js | 5 + packages/meteor-platform/package.js | 4 +- packages/meteor/startup_client.js | 2 +- tools/client/cordova_index.html | 13 ++ tools/client/meteor_cordova_loader.js | 134 +++--------------- tools/commands-cordova.js | 22 ++- 7 files changed, 74 insertions(+), 123 deletions(-) create mode 100644 tools/client/cordova_index.html diff --git a/packages/boilerplate-generator/boilerplate_web.cordova.html b/packages/boilerplate-generator/boilerplate_web.cordova.html index 6cf5ceeafe..8925fef1f5 100644 --- a/packages/boilerplate-generator/boilerplate_web.cordova.html +++ b/packages/boilerplate-generator/boilerplate_web.cordova.html @@ -5,6 +5,8 @@ +{{#each css}} {{/each}} + - +{{#each js}} +{{/each}} +{{#each additionalStaticJs}} + {{#if ../inlineScriptsAllowed}} + + {{else}} + + {{/if}} +{{/each}} {{{head}}} diff --git a/packages/logging/logging_cordova.js b/packages/logging/logging_cordova.js index 56f52ceba8..b40ada6a51 100644 --- a/packages/logging/logging_cordova.js +++ b/packages/logging/logging_cordova.js @@ -10,3 +10,8 @@ if (! /Android/i.test(navigator.userAgent)) { }; } +document.addEventListener('deviceready', function () { + if (window.cordova.logger) + window.cordova.logger.__onDeviceReady(); +}); + diff --git a/packages/meteor-platform/package.js b/packages/meteor-platform/package.js index 386dad41a8..dcf42450dd 100644 --- a/packages/meteor-platform/package.js +++ b/packages/meteor-platform/package.js @@ -67,5 +67,7 @@ Package.on_use(function(api) { }); Cordova.depends({ - 'org.apache.cordova.device': '0.2.11' + 'org.apache.cordova.device': '0.2.11', + 'com.rjfun.cordova.httpd': 'https://github.com/floatinghotpot/cordova-httpd/tarball/d0c35b5f0af356c662580791a770ee655b2e3f34' }); + diff --git a/packages/meteor/startup_client.js b/packages/meteor/startup_client.js index 7590a922c7..dacc251a8a 100644 --- a/packages/meteor/startup_client.js +++ b/packages/meteor/startup_client.js @@ -9,7 +9,7 @@ var ready = function() { }; if (document.addEventListener) { - var event = Meteor.isCordova ? 'meteor-cordova-loaded' : 'DOMContentLoaded'; + var event = Meteor.isCordova ? 'deviceready' : 'DOMContentLoaded'; document.addEventListener(event, ready, false); window.addEventListener('load', ready, false); } else { diff --git a/tools/client/cordova_index.html b/tools/client/cordova_index.html new file mode 100644 index 0000000000..92362e70f7 --- /dev/null +++ b/tools/client/cordova_index.html @@ -0,0 +1,13 @@ + + + + + +

This is default index.html for the Meteor/Cordova apps. This file should + find the correct location of the code we load, start a webserver and + redirect there. If it is a new app, it will point at + Application.app/www/application, if it had a hot code push before, it will + point at Documents/meteor/version-number/.

+

If you see this page, something might have gone wrong.

+ + diff --git a/tools/client/meteor_cordova_loader.js b/tools/client/meteor_cordova_loader.js index b19fdd92db..10e16e090c 100644 --- a/tools/client/meteor_cordova_loader.js +++ b/tools/client/meteor_cordova_loader.js @@ -7,37 +7,6 @@ */ (function () { - - var loadedEvent = (function () { - var usingEventConstructor = false; - - // some browsers don't support the Event constructor - // eg Cordova on Android JellyBean - if (window.Event) { - usingEventConstructor = true; - } - - var eventName = 'meteor-cordova-loaded'; - var event; - if (usingEventConstructor) { - try { - event = new Event(eventName); - } catch (err) { - usingEventConstructor = false; - } - } - if (! usingEventConstructor) { - event = document.createEvent('Event'); - event.initEvent(eventName, true, true); - } - - return { - dispatch: function () { - document.dispatchEvent(event); - } - }; - })(); - var readFile = function (url, cb) { window.resolveLocalFileSystemURL(url, function (fileEntry) { @@ -66,68 +35,30 @@ }; - // To ensure that all our