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

homogenized modals - add addressbook modal

Browse source
This commit is contained in:
Javier 2016-05-26 15:02:00 -03:00
commit df2811eeba
13 changed files with 491 additions and 489 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/css/ionic-migration.css
View file

@ -20,6 +20,10 @@
z-index: -1;
}
.scroll {
height: 100%;
}
.bct {
background-color: transparent !important;
margin-top: -25px;

153
src/js/controllers/modals/addressbook.js Normal file
View file

@ -0,0 +1,153 @@
'use strict';
angular.module('copayApp.controllers').controller('addressbookController', function($rootScope, $scope, $timeout, profileService, walletService, addressService, addressbookService) {
var self = $scope.self;
var fc = profileService.focusedClient;
self.lockAddress = false;
self._address = null;
$scope.editAddressbook = false;
$scope.addAddressbookEntry = false;
$scope.selectedAddressbook = {};
$scope.newAddress = address;
$scope.walletName = fc.credentials.walletName;
$scope.color = fc.backgroundColor;
$scope.addressbook = {
'address': ($scope.newAddress || ''),
'label': ''
};
$scope.checkClipboard = function() {
if (!$scope.newAddress) {
getClipboard(function(value) {
$scope.newAddress = value;
});
}
};
$scope.beforeQrCodeScann = function() {
$scope.error = null;
$scope.addAddressbookEntry = true;
$scope.editAddressbook = false;
};
$scope.onQrCodeScanned = function(data, addressbookForm) {
$timeout(function() {
var form = addressbookForm;
if (data && form) {
data = data.replace('bitcoin:', '');
form.address.$setViewValue(data);
form.address.$isValid = true;
form.address.$render();
}
$scope.$digest();
}, 100);
};
$scope.toggleEditAddressbook = function() {
$scope.editAddressbook = !$scope.editAddressbook;
$scope.selectedAddressbook = {};
$scope.addAddressbookEntry = false;
};
$scope.selectAddressbook = function(addr) {
self.setForm(addr);
$scope.cancel();
};
$scope.toggleSelectAddressbook = function(addr) {
$scope.selectedAddressbook[addr] = $scope.selectedAddressbook[addr] ? false : true;
};
$scope.toggleAddAddressbookEntry = function() {
$scope.error = null;
$scope.addressbook = {
'address': '',
'label': ''
};
$scope.addAddressbookEntry = !$scope.addAddressbookEntry;
};
$scope.list = function() {
$scope.error = null;
addressbookService.list(function(err, ab) {
if (err) {
$scope.error = err;
return;
}
$scope.list = ab;
$timeout(function() {
$scope.$digest();
});
});
};
$scope.add = function(addressbook) {
$scope.error = null;
$timeout(function() {
addressbookService.add(addressbook, function(err, ab) {
if (err) {
$scope.error = err;
return;
}
$rootScope.$emit('Local/AddressbookUpdated', ab);
$scope.list = ab;
$scope.editAddressbook = true;
$scope.toggleEditAddressbook();
$scope.$digest();
});
}, 100);
};
$scope.remove = function(addr) {
$scope.error = null;
$timeout(function() {
addressbookService.remove(addr, function(err, ab) {
if (err) {
$scope.error = err;
return;
}
$rootScope.$emit('Local/AddressbookUpdated', ab);
$scope.list = ab;
$scope.$digest();
});
}, 100);
};
$scope.selectWallet = function(walletId, walletName) {
var client = profileService.getClient(walletId);
$scope.errorSelectedWallet = {};
walletService.isReady(client, function(err) {
if (err) $scope.errorSelectedWallet[walletId] = err;
else {
$scope.gettingAddress = true;
$scope.selectedWalletName = walletName;
$timeout(function() {
$scope.$apply();
});
addressService.getAddress(walletId, false, function(err, addr) {
$scope.gettingAddress = false;
if (err) {
self.error = err;
$scope.cancelAddress();
return;
}
self.setForm(addr);
$scope.cancel();
});
}
});
};
$scope.cancelAddress = function() {
self.resetForm();
$scope.cancel();
};
$scope.cancel = function() {
$scope.addressbookModal.hide();
};
});

3
src/js/controllers/modals/paypro.js
View file

@ -1,6 +1,6 @@
'use strict';
angular.module('copayApp.controllers').controller('payproController', function($scope, profileService) {
angular.module('copayApp.controllers').controller('payproController', function($scope) {
var self = $scope.self;
$scope.alternative = self.alternativeAmount;
@ -11,6 +11,5 @@ angular.module('copayApp.controllers').controller('payproController', function($
$scope.cancel = function() {
$scope.payproModal.hide();
$scope.payproModal.remove();
};
});

10
src/js/controllers/modals/search.js Normal file
View file

@ -0,0 +1,10 @@
'use strict';
angular.module('copayApp.controllers').controller('searchController', function($scope) {
var self = $scope.self;
$scope.search = '';
$scope.cancel = function() {
$scope.searchModal.hide();
};
});

2
src/js/controllers/modals/txDetails.js
View file

@ -49,7 +49,5 @@ angular.module('copayApp.controllers').controller('txDetailsController', functio
$scope.cancel = function() {
$scope.txDetailsModal.hide();
$scope.txDetailsModal.remove();
};
});

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

@ -158,178 +158,16 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
var cancel_msg = gettextCatalog.getString('Cancel');
var confirm_msg = gettextCatalog.getString('Confirm');
this.openDestinationAddressModal = function(wallets, address) {
$rootScope.modalOpened = true;
var fc = profileService.focusedClient;
self.lockAddress = false;
self._address = null;
this.openAddressbookModal = function(wallets, address) {
$scope.wallets = wallets;
$scope.address = address;
$scope.self = self;
var ModalInstanceCtrl = function($scope, $modalInstance) {
$scope.wallets = wallets;
$scope.editAddressbook = false;
$scope.addAddressbookEntry = false;
$scope.selectedAddressbook = {};
$scope.newAddress = address;
$scope.walletName = fc.credentials.walletName;
$scope.color = fc.backgroundColor;
$scope.addressbook = {
'address': ($scope.newAddress || ''),
'label': ''
};
$scope.checkClipboard = function() {
if (!$scope.newAddress) {
getClipboard(function(value) {
$scope.newAddress = value;
});
}
};
$scope.beforeQrCodeScann = function() {
$scope.error = null;
$scope.addAddressbookEntry = true;
$scope.editAddressbook = false;
};
$scope.onQrCodeScanned = function(data, addressbookForm) {
$timeout(function() {
var form = addressbookForm;
if (data && form) {
data = data.replace('bitcoin:', '');
form.address.$setViewValue(data);
form.address.$isValid = true;
form.address.$render();
}
$scope.$digest();
}, 100);
};
$scope.selectAddressbook = function(addr) {
$modalInstance.close(addr);
};
$scope.toggleEditAddressbook = function() {
$scope.editAddressbook = !$scope.editAddressbook;
$scope.selectedAddressbook = {};
$scope.addAddressbookEntry = false;
};
$scope.toggleSelectAddressbook = function(addr) {
$scope.selectedAddressbook[addr] = $scope.selectedAddressbook[addr] ? false : true;
};
$scope.toggleAddAddressbookEntry = function() {
$scope.error = null;
$scope.addressbook = {
'address': ($scope.newAddress || ''),
'label': ''
};
$scope.addAddressbookEntry = !$scope.addAddressbookEntry;
};
$scope.list = function() {
$scope.error = null;
addressbookService.list(function(err, ab) {
if (err) {
$scope.error = err;
return;
}
$scope.list = ab;
$timeout(function() {
$scope.$digest();
});
});
};
$scope.add = function(addressbook) {
$scope.error = null;
$timeout(function() {
addressbookService.add(addressbook, function(err, ab) {
if (err) {
$scope.error = err;
return;
}
$rootScope.$emit('Local/AddressbookUpdated', ab);
$scope.list = ab;
$scope.editAddressbook = true;
$scope.toggleEditAddressbook();
$scope.$digest();
});
}, 100);
};
$scope.remove = function(addr) {
$scope.error = null;
$timeout(function() {
addressbookService.remove(addr, function(err, ab) {
if (err) {
$scope.error = err;
return;
}
$rootScope.$emit('Local/AddressbookUpdated', ab);
$scope.list = ab;
$scope.$digest();
});
}, 100);
};
$scope.cancel = function() {
$modalInstance.dismiss('cancel');
};
$scope.selectWallet = function(walletId, walletName) {
var client = profileService.getClient(walletId);
$scope.errorSelectedWallet = {};
walletService.isReady(client, function(err) {
if (err) $scope.errorSelectedWallet[walletId] = err;
else {
$scope.gettingAddress = true;
$scope.selectedWalletName = walletName;
$timeout(function() {
$scope.$apply();
});
addressService.getAddress(walletId, false, function(err, addr) {
$scope.gettingAddress = false;
if (err) {
self.error = err;
$modalInstance.dismiss('cancel');
return;
}
$modalInstance.close(addr);
});
}
});
};
};
var modalInstance = $modal.open({
templateUrl: 'views/modals/destination-address.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);
});
modalInstance.result.then(function(addr) {
if (addr) {
self.setForm(addr);
}
}, function() {
// onRejected
self.resetForm();
$ionicModal.fromTemplateUrl('views/modals/addressbook.html', {
scope: $scope
}).then(function(modal) {
$scope.addressbookModal = modal;
$scope.addressbookModal.show();
});
};
@ -1063,20 +901,18 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
});
};
$ionicModal.fromTemplateUrl('views/modals/searchTransactions.html', {
scope: $scope,
focusFirstInput: true,
animation: 'slide-in-up'
}).then(function(modal) {
$scope.modal = modal;
});
$scope.openSearchModal = function() {
$scope.modal.show();
};
var fc = profileService.focusedClient;
$scope.color = fc.backgroundColor;
$scope.self = self;
$scope.closeModal = function() {
$scope.modal.hide();
$ionicModal.fromTemplateUrl('views/modals/search.html', {
scope: $scope,
focusFirstInput: true
}).then(function(modal) {
$scope.searchModal = modal;
$scope.searchModal.show();
});
};
this.setForm = function(to, amount, comment) {
@ -1136,8 +972,10 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
};
this.openPPModal = function(paypro) {
$scope.paypro = paypro;
var fc = profileService.focusedClient;
$scope.color = fc.backgroundColor;
$scope.self = self;
$scope.paypro = paypro;
$ionicModal.fromTemplateUrl('views/modals/paypro.html', {
scope: $scope

5
src/sass/main.scss
View file

@ -863,7 +863,7 @@ ul.manage li {
.header-modal {
background: #fff;
width: 100%;
padding: 0.8rem;
padding-top: 60px;
position: relative;
}
@ -1974,11 +1974,10 @@ to prevent collapsing during animation*/
}
.modal-content {
position: fixed;
position: relative;
overflow-y: auto;
height: 100%;
width: 100%;
top: 45px;
padding-bottom: 50px;
-webkit-transform: translate3d(0, 0, 0);
background: #f6f7f9;