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

paypro: fix $root.merchant clearing on tab change. see #1406 - gustavo's comment.

Browse source
This commit is contained in:
Christopher Jeffrey 2014-09-15 15:49:52 -07:00
commit 20bc1ecbb5
1 changed files with 36 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

61
js/controllers/send.js
View file

@ -465,6 +465,40 @@ angular.module('copayApp.controllers').controller('SendController',
$scope.loadTxs(); $scope.loadTxs();
}; };
$scope.clearMerchant = function(callback) {
var scope = $scope;
// TODO: Find a better way of detecting
// whether we're in the Send scope or not.
if (!scope.sendForm || !scope.sendForm.address) {
delete $rootScope.merchant;
if (callback) callback();
return;
}
var val = scope.sendForm.address.$viewValue || '';
var uri;
// If we're setting the domain, ignore the change.
if ($rootScope.merchant && $rootScope.merchant.domain && val === $rootScope.merchant.domain) {
uri = {
merchant: $rootScope.merchant.request_url
};
}
if (val.indexOf('bitcoin:') === 0) {
uri = new bitcore.BIP21(val).data;
} else if (/^https?:\/\//.test(val)) {
uri = {
merchant: val
};
}
if (!uri || !uri.merchant) {
delete $rootScope.merchant;
scope.sendForm.amount.$setViewValue('');
scope.sendForm.amount.$render();
if (callback) callback();
if ($rootScope.$$phase !== '$apply' && $rootScope.$$phase !== '$digest') {
$rootScope.$apply();
}
}
};
$scope.onChanged = function() { $scope.onChanged = function() {
var scope = $scope; var scope = $scope;
@ -552,31 +586,8 @@ angular.module('copayApp.controllers').controller('SendController',
// If the address changes to a non-payment-protocol one, // If the address changes to a non-payment-protocol one,
// delete the `merchant` property from the scope. // delete the `merchant` property from the scope.
var unregister = scope.$watch('address', function() { var unregister = $rootScope.$watch(function() {
var val = scope.sendForm.address.$viewValue || ''; $scope.clearMerchant(unregister);
var uri;
// If we're setting the domain, ignore the change.
if ($rootScope.merchant && $rootScope.merchant.domain && val === $rootScope.merchant.domain) {
uri = {
merchant: $rootScope.merchant.request_url
};
}
if (val.indexOf('bitcoin:') === 0) {
uri = new bitcore.BIP21(val).data;
} else if (/^https?:\/\//.test(val)) {
uri = {
merchant: val
};
}
if (!uri || !uri.merchant) {
delete $rootScope.merchant;
scope.sendForm.amount.$setViewValue('');
scope.sendForm.amount.$render();
unregister();
if ($rootScope.$$phase !== '$apply' && $rootScope.$$phase !== '$digest') {
$rootScope.$apply();
}
}
}); });
if ($rootScope.$$phase !== '$apply' && $rootScope.$$phase !== '$digest') { if ($rootScope.$$phase !== '$apply' && $rootScope.$$phase !== '$digest') {