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

Merge pull request #1704 from cmgustavo/bug/04-ui

Browse source 
Bug/04 ui
This commit is contained in:
Matias Alejo Garcia 2014-11-03 18:15:35 -03:00
commit e9eb311339
12 changed files with 165 additions and 231 deletions
Download patch file Download diff file Expand all files Collapse all files

5
js/controllers/copayers.js
View file

@ -2,7 +2,10 @@
angular.module('copayApp.controllers').controller('CopayersController',
function($scope, $rootScope, $location, controllerUtils) {
$rootScope.title = 'Copayers';
if (!$rootScope.wallet.isReady()) {
$rootScope.title = 'Waiting copayers for ' + $rootScope.wallet.getName();
}
$scope.loading = false;
$scope.goToWallet = function() {
controllerUtils.updateAddressList();

8
js/controllers/homeWallet.js
View file

@ -6,17 +6,9 @@ angular.module('copayApp.controllers').controller('HomeWalletController',
$rootScope.title = 'Home';
if ($rootScope.addrInfos) {
$scope.address = $rootScope.addrInfos[0];
}
$scope.copayersList = function() {
if ($rootScope.wallet) {
$scope.copayers = $rootScope.wallet.getRegisteredPeerIds();
}
return $scope.copayers;
}
}
);

1
js/controllers/send.js
View file

@ -264,6 +264,7 @@ angular.module('copayApp.controllers').controller('SendController',
$scope.$apply(function() {
$scope.sendForm.address.$setViewValue(data);
$scope.sendForm.address.$render();
});
};