fix starting
This commit is contained in:
parent
9f41a8b79a
commit
43f04d4296
2 changed files with 6 additions and 4 deletions
|
|
@ -175,7 +175,12 @@ angular.module('copayApp.controllers').controller('pinController', function($sta
|
||||||
|
|
||||||
$scope.close = function(delay) {
|
$scope.close = function(delay) {
|
||||||
$timeout(function() {
|
$timeout(function() {
|
||||||
$ionicHistory.viewHistory().backView ? $ionicHistory.goBack() : $state.go('tabs.home');
|
var shouldReturn = $ionicHistory.viewHistory().backView && $ionicHistory.viewHistory().backView.stateName != 'starting';
|
||||||
|
|
||||||
|
if (shouldReturn)
|
||||||
|
$ionicHistory.goBack()
|
||||||
|
else
|
||||||
|
$state.go('tabs.home');
|
||||||
}, delay || 1);
|
}, delay || 1);
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -1209,12 +1209,10 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
|
||||||
function checkAndApplyLock(onResume) {
|
function checkAndApplyLock(onResume) {
|
||||||
var defaultView = 'tabs.home';
|
var defaultView = 'tabs.home';
|
||||||
|
|
||||||
console.log('[routes.js.1211]'); //TODO
|
|
||||||
if (!platformInfo.isCordova && !platformInfo.isDevel) {
|
if (!platformInfo.isCordova && !platformInfo.isDevel) {
|
||||||
goTo(defaultView);
|
goTo(defaultView);
|
||||||
}
|
}
|
||||||
|
|
||||||
console.log('[routes.js.1216]'); //TODO
|
|
||||||
function goTo(nextView) {
|
function goTo(nextView) {
|
||||||
nextView = nextView || defaultView;
|
nextView = nextView || defaultView;
|
||||||
$state.transitionTo(nextView).then(function() {
|
$state.transitionTo(nextView).then(function() {
|
||||||
|
|
@ -1289,7 +1287,6 @@ console.log('[routes.js.1216]'); //TODO
|
||||||
historyRoot: true
|
historyRoot: true
|
||||||
});
|
});
|
||||||
|
|
||||||
console.log('[routes.js.1289]'); //TODO
|
|
||||||
checkAndApplyLock();
|
checkAndApplyLock();
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue