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

refactor

Browse source
This commit is contained in:
Gabriel Bazán 2015-11-30 18:57:18 -03:00
commit 1b38a42292
2 changed files with 18 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

45
src/js/routes.js
View file

@ -466,38 +466,23 @@ angular
url: '/cordova/:status/:isHome', url: '/cordova/:status/:isHome',
views: { views: {
'main': { 'main': {
controller: function($rootScope, $state, $log, $stateParams, $timeout, go, isCordova, storageService) { controller: function($rootScope, $state, $stateParams, $timeout, go, isCordova) {
switch ($stateParams.status) {
if ($stateParams.status == "pause") case 'resume':
return; $rootScope.$emit('Local/Resume');
break;
storageService.getProfile(function(err, profile) { case 'backbutton':
if (isCordova && $stateParams.isHome == 'true' && !$rootScope.modalOpened) {
//for compatibility navigator.app.exitApp();
storageService.getCopayDisclaimerFlag(function(err, val) {
$log.debug('### State: ', $stateParams.status);
switch ($stateParams.status) {
case 'resume':
$rootScope.$emit('Local/Resume');
break;
case 'backbutton':
var shouldExit = $stateParams.isHome == 'true' || !profile.agreeDisclaimer || !val;
if (isCordova && shouldExit && !$rootScope.modalOpened) {
return navigator.app.exitApp();
} else {
$rootScope.$emit('closeModal');
}
break;
};
if (profile.agreeDisclaimer || val) {
go.walletHome(true);
} else { } else {
$state.transitionTo('disclaimer'); $rootScope.$emit('closeModal');
} }
}); break;
}); };
$timeout(function() {
$rootScope.$emit('Local/SetTab', 'walletHome', true);
}, 100);
go.walletHome();
} }
} }
}, },

14
src/js/services/go.js
View file

@ -57,17 +57,9 @@ angular.module('copayApp.services').factory('go', function($window, $rootScope,
if (fc && !fc.isComplete()) { if (fc && !fc.isComplete()) {
root.path('copayers'); root.path('copayers');
} else { } else {
if (delayed) { root.path('walletHome', function() {
$timeout(function() { $rootScope.$emit('Local/SetTab', 'walletHome', true);
root.path('walletHome', function() { });
$rootScope.$emit('Local/SetTab', 'walletHome', true);
});
}, 100);
} else {
root.path('walletHome', function() {
$rootScope.$emit('Local/SetTab', 'walletHome', true);
});
}
} }
}; };