mirror of https://github.com/BTCPrivate/copay.git
Merge pull request #1132 from yemel/refactor/remove-old-code
Remove old code
This commit is contained in:
commit
ecfdaf00cb
|
@ -10,26 +10,25 @@ angular.module('copayApp.directives')
|
|||
require: 'ngModel',
|
||||
link: function(scope, elem, attrs, ctrl) {
|
||||
var validator = function(value) {
|
||||
var uri;
|
||||
|
||||
// Regular url
|
||||
if (/^https?:\/\//.test(value)) {
|
||||
uri = {
|
||||
merchant: value
|
||||
};
|
||||
} else {
|
||||
uri = copay.HDPath.parseBitcoinURI(value);
|
||||
}
|
||||
|
||||
// Regular Address
|
||||
if (!uri || !uri.merchant) {
|
||||
var a = new Address(value);
|
||||
ctrl.$setValidity('validAddress', a.isValid() && a.network().name === config.networkName);
|
||||
ctrl.$setValidity('validAddress', true);
|
||||
return value;
|
||||
}
|
||||
|
||||
// Bip21 uri
|
||||
if (/^bitcoin:/.test(value)) {
|
||||
var uri = new bitcore.BIP21(value);
|
||||
var hasAddress = uri.address && uri.isValid() && uri.address.network().name === config.networkName;
|
||||
ctrl.$setValidity('validAddress', uri.data.merchant || hasAddress);
|
||||
return value;
|
||||
}
|
||||
|
||||
ctrl.$setValidity('validAddress', true);
|
||||
return uri.merchant;
|
||||
// Regular Address
|
||||
var a = new Address(value);
|
||||
ctrl.$setValidity('validAddress', a.isValid() && a.network().name === config.networkName);
|
||||
return value;
|
||||
};
|
||||
|
||||
ctrl.$parsers.unshift(validator);
|
||||
|
|
|
@ -50,31 +50,4 @@ HDPath.MAX_NON_HARDENED = MAX_NON_HARDENED;
|
|||
HDPath.SHARED_INDEX = SHARED_INDEX;
|
||||
HDPath.ID_INDEX = ID_INDEX;
|
||||
|
||||
HDPath.parseBitcoinURI = function(uri) {
|
||||
var ret = {};
|
||||
var data = decodeURIComponent(uri);
|
||||
var splitDots = data.split(':');
|
||||
ret.protocol = splitDots[0];
|
||||
data = splitDots.slice(1).join(':');
|
||||
var splitQuestion = data.split('?');
|
||||
ret.address = splitQuestion[0];
|
||||
|
||||
if (splitQuestion.length > 1) {
|
||||
var data = {};
|
||||
var search = splitQuestion[1];
|
||||
var parts = search.split('&');
|
||||
var part;
|
||||
var i = 0;
|
||||
for (; i < parts.length; i++) {
|
||||
part = parts[i].split('=');
|
||||
data[part[0]] = decodeURIComponent(part[1]);
|
||||
}
|
||||
ret.amount = parseFloat(data.amount);
|
||||
ret.message = data.message;
|
||||
ret.merchant = data.r;
|
||||
}
|
||||
|
||||
return ret;
|
||||
};
|
||||
|
||||
module.exports = HDPath;
|
||||
|
|
|
@ -737,7 +737,7 @@ describe('PayPro (in Wallet) model', function() {
|
|||
|
||||
// Replicates code in controllers/send.js:
|
||||
if (address.indexOf('bitcoin:') === 0) {
|
||||
uri = copay.HDPath.parseBitcoinURI(address);
|
||||
uri = new bitcore.BIP21(address).data;
|
||||
} else if (address.indexOf('Merchant: ') === 0) {
|
||||
uri = address.split(/\s+/)[1];
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue