Skip to content

Commit

Permalink
Merge pull request #221 from diwu1989/master
Browse files Browse the repository at this point in the history
missing var declaration
  • Loading branch information
dchester committed Apr 15, 2013
2 parents f677320 + 6633273 commit 3862720
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions src/js/Rickshaw.Fixtures.Number.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
Rickshaw.namespace('Rickshaw.Fixtures.Number');

Rickshaw.Fixtures.Number.formatKMBT = function(y) {
abs_y = Math.abs(y);
if (abs_y >= 1000000000000) { return y / 1000000000000 + "T" }
else if (abs_y >= 1000000000) { return y / 1000000000 + "B" }
else if (abs_y >= 1000000) { return y / 1000000 + "M" }
var abs_y = Math.abs(y);
if (abs_y >= 1000000000000) { return y / 1000000000000 + "T" }
else if (abs_y >= 1000000000) { return y / 1000000000 + "B" }
else if (abs_y >= 1000000) { return y / 1000000 + "M" }
else if (abs_y >= 1000) { return y / 1000 + "K" }
else if (abs_y < 1 && y > 0) { return y.toFixed(2) }
else if (abs_y === 0) { return '' }
else { return y }
};

Rickshaw.Fixtures.Number.formatBase1024KMGTP = function(y) {
abs_y = Math.abs(y);
var abs_y = Math.abs(y);
if (abs_y >= 1125899906842624) { return y / 1125899906842624 + "P" }
else if (abs_y >= 1099511627776){ return y / 1099511627776 + "T" }
else if (abs_y >= 1073741824) { return y / 1073741824 + "G" }
Expand Down

0 comments on commit 3862720

Please sign in to comment.