Merge branch 'fix-prefix'

d3 · Feb 18, 2014 · 04fa5dd · 04fa5dd
2 parents aaa3585 + 0cb6cd9
commit 04fa5dd
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 11 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "d3",
-  "version": "3.4.1",
+  "version": "3.4.2",
   "main": "d3.js",
   "scripts": [
     "d3.js"

diff --git a/component.json b/component.json
@@ -10,7 +10,7 @@
     "animation",
     "canvas"
   ],
-  "version": "3.4.1",
+  "version": "3.4.2",
   "main": "d3.js",
   "scripts": [
     "d3.js"

diff --git a/d3.js b/d3.js
@@ -1,6 +1,6 @@
 !function() {
   var d3 = {
-    version: "3.4.1"
+    version: "3.4.2"
   };
   if (!Date.now) Date.now = function() {
     return +new Date();
@@ -2191,12 +2191,13 @@
       type = d3_format_types.get(type) || d3_format_typeDefault;
       var zcomma = zfill && comma;
       return function(value) {
+        var fullSuffix = suffix;
         if (integer && value % 1) return "";
         var negative = value < 0 || value === 0 && 1 / value < 0 ? (value = -value, "-") : sign;
         if (scale < 0) {
           var unit = d3.formatPrefix(value, precision);
           value = unit.scale(value);
-          suffix = unit.symbol;
+          fullSuffix = unit.symbol + suffix;
         } else {
           value *= scale;
         }
@@ -2207,7 +2208,7 @@
         if (zcomma) before = formatGroup(padding + before);
         negative += prefix;
         value = before + after;
-        return (align === "<" ? negative + value + padding : align === ">" ? padding + negative + value : align === "^" ? padding.substring(0, length >>= 1) + negative + value + padding.substring(length) : negative + (zcomma ? value : padding + value)) + suffix;
+        return (align === "<" ? negative + value + padding : align === ">" ? padding + negative + value : align === "^" ? padding.substring(0, length >>= 1) + negative + value + padding.substring(length) : negative + (zcomma ? value : padding + value)) + fullSuffix;
       };
     };
   }

diff --git a/d3.min.js b/d3.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "d3",
-  "version": "3.4.1",
+  "version": "3.4.2",
   "description": "A small, free JavaScript library for manipulating documents based on data.",
   "keywords": [
     "dom",

diff --git a/src/locale/number-format.js b/src/locale/number-format.js
@@ -74,6 +74,7 @@ function d3_locale_numberFormat(locale) {
     var zcomma = zfill && comma;
 
     return function(value) {
+      var fullSuffix = suffix;
 
       // Return the empty string for floats formatted as ints.
       if (integer && (value % 1)) return "";
@@ -82,10 +83,11 @@ function d3_locale_numberFormat(locale) {
       var negative = value < 0 || value === 0 && 1 / value < 0 ? (value = -value, "-") : sign;
 
       // Apply the scale, computing it from the value's exponent for si format.
+      // Preserve the existing suffix, if any, such as the currency symbol.
       if (scale < 0) {
         var unit = d3.formatPrefix(value, precision);
         value = unit.scale(value);
-        suffix = unit.symbol;
+        fullSuffix = unit.symbol + suffix;
       } else {
         value *= scale;
       }
@@ -116,7 +118,7 @@ function d3_locale_numberFormat(locale) {
       return (align === "<" ? negative + value + padding
             : align === ">" ? padding + negative + value
             : align === "^" ? padding.substring(0, length >>= 1) + negative + value + padding.substring(length)
-            : negative + (zcomma ? value : padding + value)) + suffix;
+            : negative + (zcomma ? value : padding + value)) + fullSuffix;
     };
   };
 }

diff --git a/src/start.js b/src/start.js
@@ -1,2 +1,2 @@
 !function(){
-  var d3 = {version: "3.4.1"}; // semver
+  var d3 = {version: "3.4.2"}; // semver
diff --git a/test/format/format-test.js b/test/format/format-test.js
@@ -101,6 +101,26 @@ suite.addBatch({
       assert.strictEqual(f(999500), "999.5k");
       assert.strictEqual(f(.009995), "9.995m");
     },
+    "can output SI prefix notation with appropriate rounding and currency symbol": function(format) {
+      var f = format("$.3s");
+      assert.strictEqual(f(0), "$0.00");
+      assert.strictEqual(f(1), "$1.00");
+      assert.strictEqual(f(10), "$10.0");
+      assert.strictEqual(f(100), "$100");
+      assert.strictEqual(f(999.5), "$1.00k");
+      assert.strictEqual(f(999500), "$1.00M");
+      assert.strictEqual(f(1000), "$1.00k");
+      assert.strictEqual(f(1500.5), "$1.50k");
+      assert.strictEqual(f(145500000), "$146M");
+      assert.strictEqual(f(145999999.999999347), "$146M");
+      assert.strictEqual(f(1e26), "$100Y");
+      assert.strictEqual(f(.000001), "$1.00µ");
+      assert.strictEqual(f(.009995), "$0.0100");
+      var f = format("$.4s");
+      assert.strictEqual(f(999.5), "$999.5");
+      assert.strictEqual(f(999500), "$999.5k");
+      assert.strictEqual(f(.009995), "$9.995m");
+    },
     "can output a currency": function(format) {
       var f = format("$");
       assert.strictEqual(f(0), "$0");

diff --git a/test/locale/locale-test.js b/test/locale/locale-test.js
@@ -21,6 +21,10 @@ suite.addBatch({
       "formats currencies": function(format) {
         var f = format("$,.2f");
         assert.equal(f(12345.67), "12 345,67 руб.");
+      },
+      "formats currencies with SI-prefix notation and currency suffix": function(format) {
+        var f = format("$,.4s");
+        assert.equal(f(12345.67), "12,35k руб.");
       }
     },