Merge pull request #62 from CiprianoFreitas/master

[bug-fix] fixed numeral with zero decimal places - fixes #57
nosir · Jul 22, 2016 · 42df649 · 42df649
2 parents 14d938c + b5f644b
commit 42df649
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/src/common/DefaultProperties.js b/src/common/DefaultProperties.js
@@ -30,7 +30,7 @@ var DefaultProperties = {
 
         // numeral
         target.numeral = !!opts.numeral;
-        target.numeralDecimalScale = opts.numeralDecimalScale || 2;
+        target.numeralDecimalScale = opts.numeralDecimalScale === 0 ? 0 : opts.numeralDecimalScale || 2;
         target.numeralDecimalMark = opts.numeralDecimalMark || '.';
         target.numeralThousandsGroupStyle = opts.numeralThousandsGroupStyle || 'thousand';
 

diff --git a/src/shortcuts/NumeralFormatter.js b/src/shortcuts/NumeralFormatter.js
@@ -7,7 +7,7 @@ var NumeralFormatter = function (numeralDecimalMark,
     var owner = this;
 
     owner.numeralDecimalMark = numeralDecimalMark || '.';
-    owner.numeralDecimalScale = numeralDecimalScale || 2;
+    owner.numeralDecimalScale = numeralDecimalScale === 0 ? 0 : numeralDecimalScale || 2;
     owner.numeralThousandsGroupStyle = numeralThousandsGroupStyle || NumeralFormatter.groupStyle.thousand;
     owner.delimiter = (delimiter || delimiter === '') ? delimiter : ',';
     owner.delimiterRE = delimiter ? new RegExp('\\' + delimiter, 'g') : '';
@@ -47,7 +47,8 @@ NumeralFormatter.prototype = {
         if (value.indexOf(owner.numeralDecimalMark) >= 0) {
             parts = value.split(owner.numeralDecimalMark);
             partInteger = parts[0];
-            partDecimal = owner.numeralDecimalMark + parts[1].slice(0, owner.numeralDecimalScale);
+            if(owner.numeralDecimalScale > 0)
+                partDecimal = owner.numeralDecimalMark + parts[1].slice(0, owner.numeralDecimalScale);
         }
 
         switch (owner.numeralThousandsGroupStyle) {

diff --git a/test/fixtures/numeral.json b/test/fixtures/numeral.json
@@ -53,6 +53,19 @@
       ]
     ]
   },
+  {
+    "numeralDecimalScale": 0,
+    "numbers": [
+      [
+        "12.3456789",
+        "12"
+      ],
+      [
+        "12.3",
+        "12"
+      ]
+    ]
+  },
   {
     "numeralDecimalScale": 3,
     "numbers": [