several improvements

This commit is contained in:
Mario Colque 2014-04-21 11:32:51 -03:00
parent 319417552a
commit e928ca2b81
3 changed files with 14 additions and 8 deletions

View File

@ -9,21 +9,21 @@ angular.module('copay.addresses').controller('AddressesController',
var w = $rootScope.wallet; var w = $rootScope.wallet;
var _updateBalance = function () { var _updateBalance = function () {
controllerUtils.setSocketHandlers();
w.getBalance(function (balance, balanceByAddr) { w.getBalance(function (balance, balanceByAddr) {
if (balanceByAddr && Object.keys(balanceByAddr).length) { if (balanceByAddr && Object.keys(balanceByAddr).length) {
$scope.balanceByAddr = balanceByAddr; $rootScope.balanceByAddr = balanceByAddr;
$scope.addrs = Object.keys(balanceByAddr); $scope.addrs = Object.keys(balanceByAddr);
$scope.selectedAddr = $scope.addrs[0]; $scope.selectedAddr = $scope.addrs[0];
$scope.$digest(); $rootScope.$digest();
} }
}); });
}; };
$scope.newAddr = function() { $scope.newAddr = function() {
w.generateAddress().toString(); w.generateAddress();
_updateBalance(); _updateBalance();
controllerUtils.setSocketHandlers();
}; };
$scope.selectAddr = function(addr) { $scope.selectAddr = function(addr) {
@ -31,5 +31,5 @@ angular.module('copay.addresses').controller('AddressesController',
}; };
_updateBalance(); _updateBalance();
w.on('refresh',_updateBalance); w.on('refresh', _updateBalance);
}); });

View File

@ -26,7 +26,12 @@ angular.module('copay.header').controller('HeaderController',
$rootScope.$watch('wallet', function(wallet) { $rootScope.$watch('wallet', function(wallet) {
if (wallet) { if (wallet) {
controllerUtils.setSocketHandlers(); controllerUtils.setSocketHandlers();
$rootScope.wallet.getBalance(function(balance) {
$rootScope.$apply(function() {
$rootScope.totalBalance = balance;
});
});
} }
}); });

View File

@ -19,7 +19,8 @@ angular
validate: false validate: false
}) })
.when('/addresses', { .when('/addresses', {
templateUrl: 'addresses.html' templateUrl: 'addresses.html',
validate: true
}) })
.when('/join/:id', { .when('/join/:id', {
templateUrl: 'join.html', templateUrl: 'join.html',