github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-24 03:36:18 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: slightly safer rounding

Browse Source
This commit is contained in:
Joffrey JAFFEUX
2018-06-07 10:59:17 +02:00
committed by GitHub
parent ab089cd68b
commit 1071aa21ab
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/helpers/application.js.es6
View File

@ -8,7 +8,7 @@ registerUnbound('raw-date', dt => longDate(new Date(dt)));
registerUnbound('age-with-tooltip', dt => new safe(autoUpdatingRelativeAge(new Date(dt), {title: true}))); registerUnbound('age-with-tooltip', dt => new safe(autoUpdatingRelativeAge(new Date(dt), {title: true})));
registerUnbound('number', (orig, params) => { registerUnbound('number', (orig, params) => {
orig = parseInt(Math.round(orig), 10); orig = Math.round(parseFloat(orig));
if (isNaN(orig)) { orig = 0; } if (isNaN(orig)) { orig = 0; }
let title = I18n.toNumber(orig, { precision: 0 }); let title = I18n.toNumber(orig, { precision: 0 });

2
app/assets/javascripts/discourse/lib/formatter.js.es6
View File

@ -304,7 +304,7 @@ export function relativeAge(date, options) {
export function number(val) { export function number(val) {
let formattedNumber; let formattedNumber;
val = parseInt(Math.round(val), 10); val = Math.round(parseFloat(val));
if (isNaN(val)) val = 0; if (isNaN(val)) val = 0;
if (val > 999999) { if (val > 999999) {

3
test/javascripts/lib/formatter-test.js.es6
View File

@ -211,10 +211,13 @@ QUnit.test("number", assert => {
assert.equal(number(NaN), "0", "it returns 0 for NaN"); assert.equal(number(NaN), "0", "it returns 0 for NaN");
assert.equal(number(3333), "3.3k", "it abbreviates thousands"); assert.equal(number(3333), "3.3k", "it abbreviates thousands");
assert.equal(number(2499999), "2.5M", "it abbreviates millions"); assert.equal(number(2499999), "2.5M", "it abbreviates millions");
assert.equal(number("2499999.5"), "2.5M", "it abbreviates millions");
assert.equal(number(1000000), "1.0M", "it abbreviates a million"); assert.equal(number(1000000), "1.0M", "it abbreviates a million");
assert.equal(number(999999), "999k", "it abbreviates hundreds of thousands"); assert.equal(number(999999), "999k", "it abbreviates hundreds of thousands");
assert.equal(number(18.2), "18", "it returns a float number rounded to an integer as a string"); assert.equal(number(18.2), "18", "it returns a float number rounded to an integer as a string");
assert.equal(number(18.6), "19", "it returns a float number rounded to an integer as a string"); assert.equal(number(18.6), "19", "it returns a float number rounded to an integer as a string");
assert.equal(number("12.3"), "12", "it returns a string float rounded to an integer as a string");
assert.equal(number("12.6"), "13", "it returns a string float rounded to an integer as a string");
}); });
QUnit.test("durationTiny", assert => { QUnit.test("durationTiny", assert => {