Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3295 from RaceProUK/master 

Swapped order of checks
This commit is contained in:
Sam 2015-03-25 16:55:54 +11:00
parent eaab5c64f0 47d60ad86a
commit e5c3266c30
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/discourse/lib/formatter.js
View File

@ -261,12 +261,12 @@ var number = function(val) {
val = parseInt(val, 10);
if (isNaN(val)) val = 0;
if (val > 999) {
return (val / 1000).toFixed(1) + "K";
}
if (val > 999999) {
return (val / 1000000).toFixed(1) + "M";
}
if (val > 999) {
return (val / 1000).toFixed(1) + "K";
}
return val.toString();
};