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

fix conflicts

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-05-01 11:04:21 -03:00
commit 84637bd12d
3 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
js/models/core/Wallet.js
View file

@ -417,12 +417,12 @@ Wallet.prototype.getAddressesStr = function(opts) {
});
};
Wallet.prototype.getAddressesInfo = function(excludeChange) {
return this.publicKeyRing.getAddressesInfo(excludeChange);
Wallet.prototype.getAddressesInfo = function(opts) {
return this.publicKeyRing.getAddressesInfo(opts);
};
Wallet.prototype.addressIsOwn = function(addrStr, excludeChange) {
var addrList = this.getAddressesStr({excludeMain:true});
Wallet.prototype.addressIsOwn = function(addrStr, opts) {
var addrList = this.getAddressesStr(opts);
var l = addrList.length;
var ret = false;