BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #57 from gabrielbazan7/fix/routes 

fix activity and proposals transitions
This commit is contained in:
Matias Alejo Garcia 2016-09-05 11:24:05 -03:00 committed by GitHub
parent 22c06c73a3 14da63c485
commit 42594fb390
2 changed files with 42 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/views/tab-home.html
View File

@ -7,7 +7,7 @@
<div class="list card" ng-hide="!txps[0]">
<a class="item item-icon-right item-heading" ui-sref="proposals" translate>
<a class="item item-icon-right item-heading" ui-sref="tabs.proposals" translate>
Payment Proposals
<i class="icon ion-ios-arrow-right nav-item-arrow-right"></i>
@ -20,7 +20,7 @@
</div>
<div class="list card">
<a class="item item-icon-right item-heading" ui-sref="activity" translate>
<a class="item item-icon-right item-heading" ui-sref="tabs.activity" translate>
Recent Activity
<i class="icon ion-ios-arrow-right nav-item-arrow-right"></i>
</a>

72
src/js/routes.js
View File

@ -143,14 +143,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
url: '/uri-coinbase/:url',
templateUrl: 'views/coinbaseUri.html'
})
.state('activity', {
url: '/activity',
templateUrl: 'views/activity.html'
})
.state('proposals', {
url: '/proposals',
templateUrl: 'views/proposals.html'
})
/*
*
@ -159,17 +151,33 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
*/
.state('tabs.details', {
url: '/details/{walletId}/{fromOnboarding}',
views: {
'tab-home': {
templateUrl: 'views/walletDetails.html'
url: '/details/{walletId}/{fromOnboarding}',
views: {
'tab-home': {
templateUrl: 'views/walletDetails.html'
}
},
params: {
txid: null,
txpId: null,
},
})
.state('tabs.activity', {
url: '/activity',
views: {
'tab-home': {
templateUrl: 'views/activity.html',
}
}
},
params: {
txid: null,
txpId: null,
},
})
})
.state('tabs.proposals', {
url: '/proposals',
views: {
'tab-home': {
templateUrl: 'views/proposals.html',
}
}
})
/*
*
@ -812,21 +820,21 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
$ionicPlatform.registerBackButtonAction(function(e) {
var fromDisclaimer = $ionicHistory.currentStateName().match(/disclaimer/) ? 'true' : '';
var fromTabs = $ionicHistory.currentStateName().match(/tabs/) ? 'true' : '';
var fromDisclaimer = $ionicHistory.currentStateName().match(/disclaimer/) ? 'true' : '';
var fromTabs = $ionicHistory.currentStateName().match(/tabs/) ? 'true' : '';
if ($rootScope.backButtonPressedOnceToExit || fromDisclaimer) {
ionic.Platform.exitApp();
} else if ($ionicHistory.backView() && !fromTabs) {
$ionicHistory.goBack();
} else {
$rootScope.backButtonPressedOnceToExit = true;
window.plugins.toast.showShortBottom(gettextCatalog.getString('Press again to exit'));
setInterval(function() {
$rootScope.backButtonPressedOnceToExit = false;
}, 5000);
}
e.preventDefault();
if ($rootScope.backButtonPressedOnceToExit || fromDisclaimer) {
ionic.Platform.exitApp();
} else if ($ionicHistory.backView() && !fromTabs) {
$ionicHistory.goBack();
} else {
$rootScope.backButtonPressedOnceToExit = true;
window.plugins.toast.showShortBottom(gettextCatalog.getString('Press again to exit'));
setInterval(function() {
$rootScope.backButtonPressedOnceToExit = false;
}, 5000);
}
e.preventDefault();
}, 101);
$ionicPlatform.on('pause', function() {