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

rm copayer modal

Browse source
This commit is contained in:
Matias Alejo Garcia 2015-11-06 15:32:10 -03:00
commit 0b2ddeb8d4
5 changed files with 20 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/js/controllers/index.js
View file

@ -828,9 +828,9 @@ angular.module('copayApp.controllers').controller('indexController', function($r
}
self.showAllHistory = function() {
self.historyShowShowAll = false;
self.txHistory = self.completeHistory;
$timeout(function() {
$rootScope.$apply();
self.txHistory = self.completeHistory;
});
};
@ -857,7 +857,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self.updateHistory = function() {
var fc = profileService.focusedClient;
if (!fc.isComplete()) return;
if (!fc.isComplete() || self.updatingTxHistory) return;
$log.debug('Updating Transaction History');
self.txHistoryError = false;
@ -865,9 +865,12 @@ angular.module('copayApp.controllers').controller('indexController', function($r
$timeout(function() {
self.updateLocalTxHistory(function(err) {
if (err) self.txHistoryError = true;
self.updatingTxHistory = false;
self.showWaitingSign = false;
if (err)
self.txHistoryError = true;
$rootScope.$apply();
});
});

30
src/js/controllers/walletHome.js
View file

@ -106,36 +106,6 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
var cancel_msg = gettextCatalog.getString('Cancel');
var confirm_msg = gettextCatalog.getString('Confirm');
$scope.openCopayersModal = function(copayers, copayerId) {
$rootScope.modalOpened = true;
var fc = profileService.focusedClient;
var ModalInstanceCtrl = function($scope, $modalInstance) {
$scope.copayers = copayers;
$scope.copayerId = copayerId;
$scope.color = fc.backgroundColor;
$scope.cancel = function() {
$modalInstance.dismiss('cancel');
};
};
var modalInstance = $modal.open({
templateUrl: 'views/modals/copayers.html',
windowClass: animationService.modalAnimated.slideUp,
controller: ModalInstanceCtrl,
});
var disableCloseModal = $rootScope.$on('closeModal', function() {
modalInstance.dismiss('cancel');
});
modalInstance.result.finally(function() {
$rootScope.modalOpened = false;
disableCloseModal();
var m = angular.element(document.getElementsByClassName('reveal-modal'));
m.addClass(animationService.modalAnimated.slideOutDown);
});
};
$scope.openDestinationAddressModal = function(wallets, address) {
$rootScope.modalOpened = true;
var fc = profileService.focusedClient;