Skip to content

fix: keep the last decimal separator when unformatting values #247

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DeoJin wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: keep the last decimal separator when unformatting values #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions accounting.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,10 +195,16 @@

// Build regex to strip out everything except digits, decimal point and minus sign:
var regex = new RegExp("[^0-9-" + decimal + "]", ["g"]),
unformatted = parseFloat(
("" + value)
escapedDecimal = decimal.replace(/[-/\\^$*+?.()|[\]{}]/g, '\\$&'),
decimalRegex = new RegExp(escapedDecimal, 'g'),
strippedValue = ("" + value)
.replace(/\((?=\d+)(.*)\)/, "-$1") // replace bracketed values with negatives
.replace(regex, '') // strip out any cruft
.replace(regex, ''), // strip out any cruft
decimalCount = (strippedValue.match(decimalRegex) || []).length,
unformatted = parseFloat(
(decimalCount > 1 ? strippedValue.replace(decimalRegex, function(match, offset, string) {
return offset === string.lastIndexOf(decimal) ? match : '';
}) : strippedValue)
.replace(decimal, '.') // make sure decimal point is standard
);

Expand Down
4 changes: 4 additions & 0 deletions tests/jasmine/core/unformatSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ describe('unformat()', function(){
expect( accounting.unformat(';$@#$%^&123,456\'78', '\'') ).toBe( 123456.78 );
});

it('should ignore extra decimal separators that come from the currency symbol', function(){
expect( accounting.unformat('kr. 123.45', '.') ).toBe( 123.45 );
});

it('should accept an array', function(){
var vals = accounting.unformat(['$ 123', '$567.89', 'R$12,345,678.901']);
expect( vals[0] ).toBe( 123 );
Expand Down