Return-Path: X-Original-To: apmail-cordova-commits-archive@www.apache.org Delivered-To: apmail-cordova-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 869AA10315 for ; Mon, 10 Mar 2014 03:34:33 +0000 (UTC) Received: (qmail 58520 invoked by uid 500); 10 Mar 2014 03:34:33 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 58410 invoked by uid 500); 10 Mar 2014 03:34:32 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cordova.apache.org Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 58347 invoked by uid 99); 10 Mar 2014 03:34:27 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Mar 2014 03:34:27 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 56A3693BC5B; Mon, 10 Mar 2014 03:34:26 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: agrieve@apache.org To: commits@cordova.apache.org Date: Mon, 10 Mar 2014 03:34:25 -0000 Message-Id: <78029bc7d4be49bbba4c217121b1b4e4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/5] git commit: Fix addApp returning a promise in the middle of the promise chain (hid error messages) Repository: cordova-app-harness Updated Branches: refs/heads/master ac4a90611 -> 6f961db4e Fix addApp returning a promise in the middle of the promise chain (hid error messages) 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/343b9d0b Tree: http://git-wip-us.apache.org/repos/asf/cordova-app-harness/tree/343b9d0b Diff: http://git-wip-us.apache.org/repos/asf/cordova-app-harness/diff/343b9d0b Branch: refs/heads/master Commit: 343b9d0b4021eba94e6c29b91c67c0b4484200c8 Parents: ac4a906 Author: Andrew Grieve Authored: Sun Mar 9 22:49:16 2014 -0400 Committer: Andrew Grieve Committed: Sun Mar 9 22:49:16 2014 -0400 ---------------------------------------------------------------------- www/cdvah/js/AddCtrl.js | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-app-harness/blob/343b9d0b/www/cdvah/js/AddCtrl.js ---------------------------------------------------------------------- diff --git a/www/cdvah/js/AddCtrl.js b/www/cdvah/js/AddCtrl.js index 1373196..405c9a0 100644 --- a/www/cdvah/js/AddCtrl.js +++ b/www/cdvah/js/AddCtrl.js @@ -29,7 +29,7 @@ }); } else { $scope.appData = { - appUrl : '', + appUrl: '', installerType: 'serve' }; } @@ -53,7 +53,7 @@ }); if (urlChanged) { - p.then(function() { + return p.then(function() { // If the URL changed, trigger an update. return AppsService.updateApp(editingApp); }).then(function() { @@ -65,19 +65,18 @@ notifier.error(msg); }); } - } else { - var serviceCall = AppsService.addApp($scope.appData.installerType, $scope.appData.appUrl); - - serviceCall.then(function(handler) { - console.log('App Added'); - notifier.success('App Added'); - $location.path('/'); - return AppsService.updateApp(handler); - }, function(error) { - console.error(error); - notifier.error('Unable to add application because: ' + error.message); - }); + return p; } + return AppsService.addApp($scope.appData.installerType, $scope.appData.appUrl) + .then(function(handler) { + console.log('App Added'); + notifier.success('App Added'); + $location.path('/'); + return AppsService.updateApp(handler); + }, function(error) { + console.error(error); + notifier.error('Unable to add application because: ' + error.message); + }); }; // True if the optional barcodescanner plugin is installed.