From 14baa77404058ecce329c27db4ab0e7fcbe3f80b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Fri, 3 Mar 2017 10:36:19 -0300 Subject: [PATCH] adding controllers to route file, moving swipe back enable to enter event --- src/js/controllers/confirm.js | 6 ++++-- src/js/controllers/feedback/complete.js | 7 +++++-- src/js/controllers/feedback/send.js | 9 ++++---- .../controllers/onboarding/backupRequest.js | 8 +++---- src/js/controllers/onboarding/collectEmail.js | 2 +- src/js/controllers/onboarding/disclaimer.js | 9 +++++--- .../controllers/onboarding/notifications.js | 2 +- .../onboarding/welcomeController.js | 4 ++-- src/js/routes.js | 21 ++++++++++++------- www/views/backupWarning.html | 2 +- www/views/onboarding/backupRequest.html | 2 +- www/views/onboarding/collectEmail.html | 2 +- www/views/onboarding/disclaimer.html | 6 +++--- www/views/onboarding/notifications.html | 2 +- www/views/onboarding/tour.html | 2 +- 15 files changed, 50 insertions(+), 34 deletions(-) diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js index 0ed405ec9..ffeafc6a3 100644 --- a/src/js/controllers/confirm.js +++ b/src/js/controllers/confirm.js @@ -12,9 +12,11 @@ angular.module('copayApp.controllers').controller('confirmController', function( $ionicConfig.views.swipeBackEnabled(true); }); - $scope.$on("$ionicView.beforeEnter", function(event, data) { - + $scope.$on("$ionicView.enter", function(event, data) { $ionicConfig.views.swipeBackEnabled(false); + }); + + $scope.$on("$ionicView.beforeEnter", function(event, data) { toAmount = data.stateParams.toAmount; cachedSendMax = {}; diff --git a/src/js/controllers/feedback/complete.js b/src/js/controllers/feedback/complete.js index 2c72c7c95..8c6d9f140 100644 --- a/src/js/controllers/feedback/complete.js +++ b/src/js/controllers/feedback/complete.js @@ -50,6 +50,11 @@ angular.module('copayApp.controllers').controller('completeController', function $ionicConfig.views.swipeBackEnabled(true); }); + $scope.$on("$ionicView.enter", function() { + if (!$scope.fromSettings) + $ionicConfig.views.swipeBackEnabled(false); + }); + $scope.$on("$ionicView.beforeEnter", function(event, data) { $scope.score = (data.stateParams && data.stateParams.score) ? parseInt(data.stateParams.score) : null; $scope.skipped = (data.stateParams && data.stateParams.skipped) ? true : false; @@ -57,11 +62,9 @@ angular.module('copayApp.controllers').controller('completeController', function $scope.fromSettings = (data.stateParams && data.stateParams.fromSettings) ? true : false; if (!$scope.fromSettings) { - $ionicConfig.views.swipeBackEnabled(false); $ionicNavBarDelegate.showBackButton(false); } else { $ionicNavBarDelegate.showBackButton(true); - $ionicConfig.views.swipeBackEnabled(true); } storageService.getFeedbackInfo(function(error, info) { diff --git a/src/js/controllers/feedback/send.js b/src/js/controllers/feedback/send.js index ed363612d..7be7687ff 100644 --- a/src/js/controllers/feedback/send.js +++ b/src/js/controllers/feedback/send.js @@ -45,15 +45,16 @@ angular.module('copayApp.controllers').controller('sendController', function($sc $ionicConfig.views.swipeBackEnabled(true); }); + $scope.$on("$ionicView.enter", function(event, data) { + if ($scope.score) + $ionicConfig.views.swipeBackEnabled(false); + }); + $scope.$on("$ionicView.beforeEnter", function(event, data) { $scope.isCordova = platformInfo.isCordova; $scope.score = (data.stateParams && data.stateParams.score) ? parseInt(data.stateParams.score) : null; $scope.feedback = {}; - if ($scope.score) { - $ionicConfig.views.swipeBackEnabled(false); - } - switch ($scope.score) { case 1: $scope.reaction = "Ouch!"; diff --git a/src/js/controllers/onboarding/backupRequest.js b/src/js/controllers/onboarding/backupRequest.js index 53f1d4cc4..0aad02874 100644 --- a/src/js/controllers/onboarding/backupRequest.js +++ b/src/js/controllers/onboarding/backupRequest.js @@ -4,12 +4,12 @@ angular.module('copayApp.controllers').controller('backupRequestController', fun $scope.walletId = $stateParams.walletId; - $scope.$on("$ionicView.beforeLeave", function(event, data) { - $ionicConfig.views.swipeBackEnabled(true); + $scope.$on("$ionicView.enter", function() { + $ionicConfig.views.swipeBackEnabled(false); }); - $scope.$on("$ionicView.beforeEnter", function(event, data) { - $ionicConfig.views.swipeBackEnabled(false); + $scope.$on("$ionicView.beforeLeave", function() { + $ionicConfig.views.swipeBackEnabled(true); }); $scope.openPopup = function() { diff --git a/src/js/controllers/onboarding/collectEmail.js b/src/js/controllers/onboarding/collectEmail.js index 2cfaed7b9..be1cafd24 100644 --- a/src/js/controllers/onboarding/collectEmail.js +++ b/src/js/controllers/onboarding/collectEmail.js @@ -6,7 +6,7 @@ angular.module('copayApp.controllers').controller('collectEmailController', func $ionicConfig.views.swipeBackEnabled(true); }); - $scope.$on("$ionicView.beforeEnter", function() { + $scope.$on("$ionicView.enter", function() { $ionicConfig.views.swipeBackEnabled(false); }); diff --git a/src/js/controllers/onboarding/disclaimer.js b/src/js/controllers/onboarding/disclaimer.js index 573cb2ab6..ab5c7774b 100644 --- a/src/js/controllers/onboarding/disclaimer.js +++ b/src/js/controllers/onboarding/disclaimer.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('disclaimerController', function($scope, $timeout, $state, $log, $ionicModal, profileService, uxLanguage, externalLinkService, storageService, $stateParams, startupService, $rootScope) { +angular.module('copayApp.controllers').controller('disclaimerController', function($scope, $timeout, $state, $log, $ionicModal, $ionicConfig, profileService, uxLanguage, externalLinkService, storageService, $stateParams, startupService, $rootScope) { $scope.$on("$ionicView.afterEnter", function() { startupService.ready(); @@ -11,12 +11,15 @@ angular.module('copayApp.controllers').controller('disclaimerController', functi $scope.terms = {}; $scope.accepted = {}; $scope.accepted.first = $scope.accepted.second = $scope.accepted.third = false; - $scope.backedUp = $stateParams.backedUp; + $scope.backedUp = $stateParams.backedUp == 'false' ? false : true; $scope.resume = $stateParams.resume || false; - if ($scope.backedUp || $scope.resume) $ionicConfig.views.swipeBackEnabled(false); $scope.shrinkView = false; }); + $scope.$on("$ionicView.enter", function() { + if ($scope.backedUp || $scope.resume) $ionicConfig.views.swipeBackEnabled(false); + }); + $scope.$on("$ionicView.beforeLeave", function() { $ionicConfig.views.swipeBackEnabled(true); }); diff --git a/src/js/controllers/onboarding/notifications.js b/src/js/controllers/onboarding/notifications.js index e6df0bfbf..e42d37ac1 100644 --- a/src/js/controllers/onboarding/notifications.js +++ b/src/js/controllers/onboarding/notifications.js @@ -2,7 +2,7 @@ angular.module('copayApp.controllers').controller('notificationsController', function($scope, $state, $timeout, $stateParams, $ionicConfig, profileService, configService, $interval) { - $scope.$on("$ionicView.beforeEnter", function() { + $scope.$on("$ionicView.enter", function() { $ionicConfig.views.swipeBackEnabled(false); }); diff --git a/src/js/controllers/onboarding/welcomeController.js b/src/js/controllers/onboarding/welcomeController.js index 3a81fc2f8..3b92d5d22 100644 --- a/src/js/controllers/onboarding/welcomeController.js +++ b/src/js/controllers/onboarding/welcomeController.js @@ -2,11 +2,11 @@ angular.module('copayApp.controllers').controller('welcomeController', function($scope, $state, $timeout, $ionicConfig, $log, profileService, startupService, storageService) { - $scope.$parent.$on("$ionicView.afterEnter", function() { + $scope.$on("$ionicView.afterEnter", function() { startupService.ready(); }); - $scope.$on("$ionicView.beforeEnter", function() { + $scope.$on("$ionicView.enter", function() { $ionicConfig.views.swipeBackEnabled(false); }); diff --git a/src/js/routes.js b/src/js/routes.js index 9f92325fc..cfab39815 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -699,7 +699,8 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr url: '/welcome', views: { 'onboarding': { - templateUrl: 'views/onboarding/welcome.html' + templateUrl: 'views/onboarding/welcome.html', + controller: 'welcomeController' } } }) @@ -707,7 +708,8 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr url: '/tour', views: { 'onboarding': { - templateUrl: 'views/onboarding/tour.html' + templateUrl: 'views/onboarding/tour.html', + controller: 'tourController' } } }) @@ -715,7 +717,8 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr url: '/collectEmail/:walletId', views: { 'onboarding': { - templateUrl: 'views/onboarding/collectEmail.html' + templateUrl: 'views/onboarding/collectEmail.html', + controller: 'collectEmailController' } } }) @@ -723,7 +726,8 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr url: '/notifications/:walletId', views: { 'onboarding': { - templateUrl: 'views/onboarding/notifications.html' + templateUrl: 'views/onboarding/notifications.html', + controller: 'notificationsController' } } }) @@ -731,7 +735,8 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr url: '/backupRequest/:walletId', views: { 'onboarding': { - templateUrl: 'views/onboarding/backupRequest.html' + templateUrl: 'views/onboarding/backupRequest.html', + controller: 'backupRequestController' } } }) @@ -739,7 +744,8 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr url: '/backupWarning/:from/:walletId', views: { 'onboarding': { - templateUrl: 'views/backupWarning.html' + templateUrl: 'views/backupWarning.html', + controller: 'backupWarningController' } } }) @@ -765,7 +771,8 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr url: '/terms', views: { 'onboarding': { - templateUrl: 'views/onboarding/terms.html' + templateUrl: 'views/onboarding/terms.html', + controller: 'termsController' } } }) diff --git a/www/views/backupWarning.html b/www/views/backupWarning.html index 67848cca0..49b7bc131 100644 --- a/www/views/backupWarning.html +++ b/www/views/backupWarning.html @@ -1,4 +1,4 @@ - + - +
Quick review!
Almost done! Let's review.
@@ -37,7 +37,7 @@
-
+

I have read, understood, and agree to the Terms of Use.

diff --git a/www/views/onboarding/notifications.html b/www/views/onboarding/notifications.html index a05648f92..40a69ccad 100644 --- a/www/views/onboarding/notifications.html +++ b/www/views/onboarding/notifications.html @@ -1,5 +1,5 @@ - +
Push Notifications
Would you like to receive push notifications about payments?
diff --git a/www/views/onboarding/tour.html b/www/views/onboarding/tour.html index b7cf42466..0fde2bfc1 100644 --- a/www/views/onboarding/tour.html +++ b/www/views/onboarding/tour.html @@ -1,4 +1,4 @@ - +