Regenerate assets and bump version

nosir · Jul 22, 2016 · f0a2d6a · f0a2d6a
1 parent 42df649
commit f0a2d6a
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 18 deletions.
diff --git a/bower.json b/bower.json
@@ -8,7 +8,7 @@
     "form",
     "input"
   ],
-  "version": "0.4.10",
+  "version": "0.4.11",
   "author": {
     "name": "Max Huang",
     "email": "[email protected]",

diff --git a/dist/cleave-react.js b/dist/cleave-react.js
diff --git a/dist/cleave-react.min.js b/dist/cleave-react.min.js
diff --git a/dist/cleave.js b/dist/cleave.js
@@ -365,7 +365,7 @@ var DefaultProperties = {
 
         // numeral
         target.numeral = !!opts.numeral;
-        target.numeralDecimalScale = opts.numeralDecimalScale || 2;
+        target.numeralDecimalScale = opts.numeralDecimalScale >= 0 ? opts.numeralDecimalScale : 2;
         target.numeralDecimalMark = opts.numeralDecimalMark || '.';
         target.numeralThousandsGroupStyle = opts.numeralThousandsGroupStyle || 'thousand';
 
@@ -608,7 +608,7 @@ var NumeralFormatter = function (numeralDecimalMark,
     var owner = this;
 
     owner.numeralDecimalMark = numeralDecimalMark || '.';
-    owner.numeralDecimalScale = numeralDecimalScale || 2;
+    owner.numeralDecimalScale = numeralDecimalScale >= 0 ? numeralDecimalScale : 2;
     owner.numeralThousandsGroupStyle = numeralThousandsGroupStyle || NumeralFormatter.groupStyle.thousand;
     owner.delimiter = (delimiter || delimiter === '') ? delimiter : ',';
     owner.delimiterRE = delimiter ? new RegExp('\\' + delimiter, 'g') : '';
@@ -666,7 +666,7 @@ NumeralFormatter.prototype = {
             partInteger = partInteger.replace(/(\d)(?=(\d{3})+$)/g, '$1' + owner.delimiter);
         }
 
-        return partInteger.toString() + partDecimal.toString();
+        return partInteger.toString() + (owner.numeralDecimalScale > 0 ? partDecimal.toString() : '');
     }
 };
 

diff --git a/dist/cleave.min.js b/dist/cleave.min.js
diff --git a/package.json b/package.json
@@ -10,7 +10,7 @@
     "form",
     "input"
   ],
-  "version": "0.4.10",
+  "version": "0.4.11",
   "author": {
     "name": "Max Huang",
     "url": "http://github.com/nosir",

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 === 0 ? 0 : opts.numeralDecimalScale || 2;
+        target.numeralDecimalScale = opts.numeralDecimalScale >= 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 === 0 ? 0 : numeralDecimalScale || 2;
+    owner.numeralDecimalScale = numeralDecimalScale >= 0 ? numeralDecimalScale : 2;
     owner.numeralThousandsGroupStyle = numeralThousandsGroupStyle || NumeralFormatter.groupStyle.thousand;
     owner.delimiter = (delimiter || delimiter === '') ? delimiter : ',';
     owner.delimiterRE = delimiter ? new RegExp('\\' + delimiter, 'g') : '';
@@ -47,8 +47,7 @@ NumeralFormatter.prototype = {
         if (value.indexOf(owner.numeralDecimalMark) >= 0) {
             parts = value.split(owner.numeralDecimalMark);
             partInteger = parts[0];
-            if(owner.numeralDecimalScale > 0)
-                partDecimal = owner.numeralDecimalMark + parts[1].slice(0, owner.numeralDecimalScale);
+            partDecimal = owner.numeralDecimalMark + parts[1].slice(0, owner.numeralDecimalScale);
         }
 
         switch (owner.numeralThousandsGroupStyle) {
@@ -66,7 +65,7 @@ NumeralFormatter.prototype = {
             partInteger = partInteger.replace(/(\d)(?=(\d{3})+$)/g, '$1' + owner.delimiter);
         }
 
-        return partInteger.toString() + partDecimal.toString();
+        return partInteger.toString() + (owner.numeralDecimalScale > 0 ? partDecimal.toString() : '');
     }
 };