You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2014/10/25 03:26:32 UTC
[14/17] git commit: Fix android launch now that UrlRemapper doesn't
apply to main webview
Fix android launch now that UrlRemapper doesn't apply to main webview
Project: http://git-wip-us.apache.org/repos/asf/cordova-app-harness/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-app-harness/commit/54cd7bba
Tree: http://git-wip-us.apache.org/repos/asf/cordova-app-harness/tree/54cd7bba
Diff: http://git-wip-us.apache.org/repos/asf/cordova-app-harness/diff/54cd7bba
Branch: refs/heads/master
Commit: 54cd7bbaa1d575bd05057565794fb8ae9d27c495
Parents: dc55639
Author: Andrew Grieve <ag...@chromium.org>
Authored: Fri Oct 24 21:24:02 2014 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Fri Oct 24 21:26:07 2014 -0400
----------------------------------------------------------------------
www/cdvah/js/AppsService.js | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-app-harness/blob/54cd7bba/www/cdvah/js/AppsService.js
----------------------------------------------------------------------
diff --git a/www/cdvah/js/AppsService.js b/www/cdvah/js/AppsService.js
index 2dd55c8..00443d5 100644
--- a/www/cdvah/js/AppsService.js
+++ b/www/cdvah/js/AppsService.js
@@ -158,13 +158,8 @@
activeInstaller = installer;
return installer.launch();
}).then(function(launchUrl) {
- // Don't just use ResourcesLoader.doesFileExist because remaps might make it exist.
- return ResourcesLoader.xhrGet(launchUrl)
- .then(null, function() {
- throw new Error('Start file does not exist: ' + launchUrl.replace(/.*?\/www\//, 'www/'));
- }).then(function() {
- return installer.getPluginMetadata();
- }).then(function(pluginMetadata) {
+ return installer.getPluginMetadata()
+ .then(function(pluginMetadata) {
$location.path('/inappmenu');
// If we're relaunching the active app, just reload the existing webview.
// Otherwise, create a new one.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org