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

This commit is contained in:
JoelKatz
2013-03-05 06:46:52 -08:00

View File

@@ -613,8 +613,7 @@ Amount.prototype.parse_issuer = function (issuer) {
Amount.prototype.parse_json = function (j) { Amount.prototype.parse_json = function (j) {
if ('string' === typeof j) { if ('string' === typeof j) {
// .../.../... notation is not a wire format. But allowed for easier testing. // .../.../... notation is not a wire format. But allowed for easier testing.
// var m = j.match(/^(.+)\/(...)(?:\/(.+))?$/); var m = j.match(/^([^/]+)\/(...)(?:\/(.+))?$/);
var m = j.match(/^(.+)\/(...)\/(.+)$/);
if (m) { if (m) {
this._currency = Currency.from_json(m[2]); this._currency = Currency.from_json(m[2]);