paypro: more cleaning up of form.

This commit is contained in:
Christopher Jeffrey 2014-08-01 20:00:14 -07:00 committed by Manuel Araoz
parent 3b550d853f
commit 4dd725aa48
2 changed files with 12 additions and 1 deletions

View File

@ -65,6 +65,10 @@ angular.module('copayApp.controllers').controller('SendController',
var txp = w.txProposals.txps[ntxid]; var txp = w.txProposals.txps[ntxid];
var merchantData = txp.merchant; var merchantData = txp.merchant;
var amt = angular.element(document.querySelector('input#amount')); var amt = angular.element(document.querySelector('input#amount'));
var sendto = angular.element(document
.querySelector('div.send-note > p[ng-class]:first-of-type'));
var tamount = angular.element(document
.querySelector('div.send-note > p[ng-class]:nth-of-type(2)'));
var submit = angular.element(document.querySelector('button[type=submit]')); var submit = angular.element(document.querySelector('button[type=submit]'));
var sendall = angular.element(document.querySelector('[title="Send all funds"]')); var sendall = angular.element(document.querySelector('[title="Send all funds"]'));
if (w.isShared()) { if (w.isShared()) {
@ -81,6 +85,8 @@ angular.module('copayApp.controllers').controller('SendController',
$scope.loadTxs(); $scope.loadTxs();
if (merchantData) { if (merchantData) {
amt.attr('disabled', false); amt.attr('disabled', false);
sendto.html(sendto.html().replace(/<br><b>Server:.*$/, ''));
tamount.html('');
submit.attr('disabled', true); submit.attr('disabled', true);
sendall.attr('class', sendall.attr('class').replace(' hidden', '')); sendall.attr('class', sendall.attr('class').replace(' hidden', ''));
} }
@ -103,6 +109,8 @@ angular.module('copayApp.controllers').controller('SendController',
$scope.loadTxs(); $scope.loadTxs();
if (merchantData) { if (merchantData) {
amt.attr('disabled', false); amt.attr('disabled', false);
sendto.html(sendto.html().replace(/<br><b>Server:.*$/, ''));
tamount.html('');
submit.attr('disabled', true); submit.attr('disabled', true);
sendall.attr('class', sendall.attr('class').replace(' hidden', '')); sendall.attr('class', sendall.attr('class').replace(' hidden', ''));
} }

View File

@ -86,13 +86,16 @@ angular.module('copayApp.directives')
if (amount.attr('disabled') === true) { if (amount.attr('disabled') === true) {
amount.attr('disabled', false); amount.attr('disabled', false);
} }
if (amount.attr('disabled') === false) { if (submit.attr('disabled') === false) {
submit.attr('disabled', true); submit.attr('disabled', true);
} }
sendto.html(sendto.html().replace(/<br><b>Server:.*$/, '')); sendto.html(sendto.html().replace(/<br><b>Server:.*$/, ''));
if (!/hidden/.test(tamount.attr('class'))) { if (!/hidden/.test(tamount.attr('class'))) {
tamount.attr(tamount.attr('class') + ' hidden'); tamount.attr(tamount.attr('class') + ' hidden');
} }
if (~tamount.html().indexOf('(CA: ')) {
tamount.html('');
}
if (submit.attr('disabled') === false) { if (submit.attr('disabled') === false) {
submit.attr('disabled', true); submit.attr('disabled', true);
} }