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

Merge pull request #3833 from cmgustavo/ref/waiting-for-copayes

Browse source 
Ref. Waiting for Copayers
This commit is contained in:
Matias Alejo Garcia 2016-02-01 09:35:20 -03:00
commit 0875b7dd5b
6 changed files with 69 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/css/main.css
View file

@ -1121,6 +1121,7 @@ input.ng-invalid-match, input.ng-invalid-match:focus {
word-wrap: break-word;
text-align: center;
font-size: 14px;
margin: 10px;
}
.collapse {
@ -1431,12 +1432,13 @@ input.ng-invalid-match, input.ng-invalid-match:focus {
/*/////////////////// SPINNER ////////////////////*/
#history .spinner, #receive .spinner {
#history .spinner, #receive .spinner, .copayers .spinner {
height: 46px;
}
#history .spinner > div,
#receive .spinner > div
#receive .spinner > div,
.copayers .spinner > div
{
background-color: #7A8C9E;
}

6
src/css/mobile.css
View file

@ -267,12 +267,6 @@ _:-ms-fullscreen, :root .main {
bottom: 0;
}
.copayers {
position: relative;
padding: 0;
overflow-y: none;
}
ul.copayer-list img {
width: 30px;
height: 30px;

38
src/js/controllers/copayers.js
View file

@ -16,8 +16,6 @@ angular.module('copayApp.controllers').controller('copayersController',
go.walletHome();
return;
}
self.loading = false;
self.isCordova = isCordova;
};
var _modalDeleteWallet = function() {
@ -55,25 +53,23 @@ angular.module('copayApp.controllers').controller('copayersController',
var _deleteWallet = function() {
var fc = profileService.focusedClient;
$timeout(function() {
var fc = profileService.focusedClient;
var walletName = fc.credentials.walletName;
profileService.deleteWalletFC({}, function(err) {
if (err) {
this.error = err.message || err;
console.log(err);
$timeout(function() {
$scope.$digest();
});
} else {
go.walletHome();
$timeout(function() {
notification.success(gettextCatalog.getString('Success'), gettextCatalog.getString('The wallet "{{walletName}}" was deleted', {walletName: walletName}));
});
}
});
}, 100);
var walletName = fc.credentials.walletName;
profileService.deleteWalletFC({}, function(err) {
if (err) {
self.error = err.message || err;
$timeout(function() {
$scope.$digest();
});
} else {
go.walletHome();
$timeout(function() {
notification.success(
gettextCatalog.getString('Success'),
gettextCatalog.getString('The wallet "{{walletName}}" was deleted', {walletName: walletName})
);
});
}
});
};
self.deleteWallet = function() {