Merge branch 'fix-si-format-rounding' into 2.9.2

goodtohear · May 16, 2012 · 5fff2c3 · 5fff2c3
2 parents 7827bdc + 00bc3f0
commit 5fff2c3
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git a/d3.v2.js b/d3.v2.js
@@ -661,7 +661,7 @@ d3.format = function(specifier) {
     // Apply the scale, computing it from the value's exponent for si format.
     if (scale < 0) {
       var prefix = d3.formatPrefix(value, precision);
-      value *= prefix.scale;
+      value = prefix.scale(value);
       suffix = prefix.symbol;
     } else {
       value *= scale;
@@ -730,12 +730,12 @@ d3.formatPrefix = function(value, precision) {
 };
 
 function d3_formatPrefix(d, i) {
+  var k = Math.pow(10, Math.abs(8 - i) * 3);
   return {
-    scale: Math.pow(10, (8 - i) * 3),
+    scale: i > 8 ? function(d) { return d / k; } : function(d) { return d * k; },
     symbol: d
   };
 }
-
 /*
  * TERMS OF USE - EASING EQUATIONS
  *

diff --git a/d3.v2.min.js b/d3.v2.min.js
diff --git a/src/core/format.js b/src/core/format.js
@@ -43,7 +43,7 @@ d3.format = function(specifier) {
     // Apply the scale, computing it from the value's exponent for si format.
     if (scale < 0) {
       var prefix = d3.formatPrefix(value, precision);
-      value *= prefix.scale;
+      value = prefix.scale(value);
       suffix = prefix.symbol;
     } else {
       value *= scale;

diff --git a/src/core/formatPrefix.js b/src/core/formatPrefix.js
@@ -12,9 +12,9 @@ d3.formatPrefix = function(value, precision) {
 };
 
 function d3_formatPrefix(d, i) {
+  var k = Math.pow(10, Math.abs(8 - i) * 3);
   return {
-    scale: Math.pow(10, (8 - i) * 3),
+    scale: i > 8 ? function(d) { return d / k; } : function(d) { return d * k; },
     symbol: d
   };
 }
-
diff --git a/test/core/format-test.js b/test/core/format-test.js
@@ -78,6 +78,7 @@ suite.addBatch({
       assert.strictEqual(f(999.5), "999.5");
       assert.strictEqual(f(999500), "999.5k");
       assert.strictEqual(f(1000), "1k");
+      assert.strictEqual(f(1400), "1.4k");
       assert.strictEqual(f(1500.5), "1.5005k");
       assert.strictEqual(f(.000001), "1μ");
     },