ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-28 06:55:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:jedmccaleb/NewCoin

Browse Source
This commit is contained in:
JoelKatz
2012-12-02 01:02:46 -08:00
parent 7489eafe1e 2151572b8e
commit 1ed90b5bb5
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/js/amount.js
View File

@@ -548,11 +548,14 @@ Amount.prototype.to_json = function() {
}
else
{
return {
var amount_json = {
'value' : this.to_text(),
'currency' : this._currency.to_json(),
'issuer' : this._issuer.to_json(),
'currency' : this._currency.to_json()
};
if (this._issuer.is_valid()) {
amount_json.issuer = this._issuer.to_json();
}
return amount_json;
}
};
@@ -756,7 +759,7 @@ Amount.prototype.parse_json = function(j) {
// Parse the passed value to sanitize and copy it.
this._currency.parse_json(j.currency); // Never XRP.
this._issuer.parse_json(j.issuer);
if ("string" === typeof j.issuer) this._issuer.parse_json(j.issuer);
this.parse_value(j.value);
}
else {