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

ensure scan view resumes on action sheet close

This commit is contained in:
Marty Alcala 2016-10-18 17:38:47 -04:00
parent 78bd523391
commit 0d34b4d2f7
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/js/controllers/tab-scan.js
View File

@ -105,6 +105,7 @@ angular.module('copayApp.controllers').controller('tabScanController', function(
}
$rootScope.$on('incomingDataMenu.menuHidden', function() {
console.log('in herererere');
scannerService.resumePreview();
activate();
});

3
src/js/directives/actionSheet.js
View File

@ -1,7 +1,7 @@
'use strict';
angular.module('copayApp.directives')
.directive('actionSheet', function() {
.directive('actionSheet', function($rootScope) {
return {
restrict: 'E',
templateUrl: 'views/includes/actionSheet.html',
@ -12,6 +12,7 @@ angular.module('copayApp.directives')
link: function(scope, element, attrs) {
scope.hide = function() {
scope.show = false;
$rootScope.$broadcast('incomingDataMenu.menuHidden');
};
}
};

8
src/js/directives/incomingDataMenu.js
View File

@ -22,14 +22,18 @@ angular.module('copayApp.directives')
scope.sendPaymentToAddress = function(bitcoinAddress) {
scope.showMenu = false;
$state.go('tabs.send').then(function() {
$state.transitionTo('tabs.send.amount', {toAddress: bitcoinAddress});
$timeout(function() {
$state.transitionTo('tabs.send.amount', {toAddress: bitcoinAddress});
}, 50);
});
};
scope.addToAddressBook = function(bitcoinAddress) {
scope.showMenu = false;
$timeout(function() {
$state.go('tabs.send').then(function() {
$state.transitionTo('tabs.send.addressbook', {addressbookEntry: bitcoinAddress});
$timeout(function() {
$state.transitionTo('tabs.send.addressbook', {addressbookEntry: bitcoinAddress});
}, 10);
});
}, 100);
};