ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

JS: fixes for parsing amounts.

Browse Source
This commit is contained in:
Arthur Britto
2012-11-26 12:59:52 -08:00
parent 0833f720e3
commit 8a83251da7
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/js/amount.js
View File

@@ -578,7 +578,8 @@ Amount.prototype.parse_native = function(j) {
return this;
};
// Parse a non-native value.
// Parse a non-native value for the json wire format.
// Requires _currency to be set!
Amount.prototype.parse_value = function(j) {
this._is_native = false;
@@ -605,7 +606,7 @@ Amount.prototype.parse_value = function(j) {
this.canonicalize();
}
else if (d) {
// float notation
// float notation : values multiplied by 1,000,000.
var integer = new BigInteger(d[2]);
var fraction = new BigInteger(d[3]);
@@ -647,9 +648,9 @@ Amount.prototype.parse_json = function(j) {
var m = j.match(/^(.+)\/(...)\/(.+)$/);
if (m) {
this.parse_value(m[1]);
this._currency = Currency.from_json(m[2]);
this._issuer = UInt160.from_json(m[3]);
this.parse_value(m[1]);
}
else {
this.parse_native(j);
@@ -663,9 +664,9 @@ Amount.prototype.parse_json = function(j) {
else if ('object' === typeof j && 'value' in j) {
// Parse the passed value to sanitize and copy it.
this.parse_value(j.value);
this._currency.parse_json(j.currency); // Never XRP.
this._issuer.parse_json(j.issuer);
this.parse_value(j.value);
}
else {
this._value = NaN;