anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

prevent default in onboarding views with no back

Browse source
This commit is contained in:
Gabriel Bazán 2016-09-14 14:43:38 -03:00
commit a2922e0d5e
2 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/js/controllers/onboarding/collectEmail.js
View file

@ -1,6 +1,6 @@
'use strict'; 'use strict';
angular.module('copayApp.controllers').controller('collectEmailController', function($scope, $state, $timeout, $stateParams, profileService, configService, walletService, platformInfo) { angular.module('copayApp.controllers').controller('collectEmailController', function($scope, $state, $timeout, $ionicPlatform, $stateParams, profileService, configService, walletService, platformInfo) {
var isCordova = platformInfo.isCordova; var isCordova = platformInfo.isCordova;
var isWP = platformInfo.isWP; var isWP = platformInfo.isWP;

17
src/js/routes.js
View file

@ -789,6 +789,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
$ionicPlatform.registerBackButtonAction(function(e) { $ionicPlatform.registerBackButtonAction(function(e) {
//from root tabs view
var fromWelcome = $ionicHistory.currentStateName().match(/welcome/) ? true : false; var fromWelcome = $ionicHistory.currentStateName().match(/welcome/) ? true : false;
var matchHome = $ionicHistory.currentStateName().match(/home/) ? true : false; var matchHome = $ionicHistory.currentStateName().match(/home/) ? true : false;
var matchReceive = $ionicHistory.currentStateName().match(/receive/) ? true : false; var matchReceive = $ionicHistory.currentStateName().match(/receive/) ? true : false;
@ -796,9 +797,23 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
var matchSettings = $ionicHistory.currentStateName().match(/settings/) ? true : false; var matchSettings = $ionicHistory.currentStateName().match(/settings/) ? true : false;
var fromTabs = matchHome | matchReceive | matchSend | matchSettings; var fromTabs = matchHome | matchReceive | matchSend | matchSettings;
//onboarding with no back views
var matchCollectEmail = $ionicHistory.currentStateName().match(/collectEmail/) ? true : false;
var matchBackupRequest = $ionicHistory.currentStateName().match(/backupRequest/) ? true : false;
var matchDisclaimer = $ionicHistory.currentStateName().match(/disclaimer/) ? true : false;
var matchNotifications = $ionicHistory.currentStateName().match(/notifications/) ? true : false;
var fromOnboarding = matchCollectEmail | matchBackupRequest | matchDisclaimer | matchNotifications;
if (fromOnboarding) {
e.preventDefault();
return;
}
if ($ionicHistory.backView() && !fromTabs) { if ($ionicHistory.backView() && !fromTabs) {
$ionicHistory.goBack(); $ionicHistory.goBack();
} else if ($rootScope.backButtonPressedOnceToExit || fromWelcome) { } else
if ($rootScope.backButtonPressedOnceToExit || fromWelcome) {
ionic.Platform.exitApp(); ionic.Platform.exitApp();
} else { } else {
$rootScope.backButtonPressedOnceToExit = true; $rootScope.backButtonPressedOnceToExit = true;