[Issue-84] Code patch and regenerate assets

mteverest · Aug 26, 2016 · 02651c1 · 02651c1
1 parent 996c65e
commit 02651c1
Show file tree

Hide file tree

Showing 12 changed files with 78 additions and 39 deletions.
diff --git a/bower.json b/bower.json
@@ -8,7 +8,7 @@
     "form",
     "input"
   ],
-  "version": "0.6.12",
+  "version": "0.6.14",
   "author": {
     "name": "Max Huang",
     "email": "[email protected]",

diff --git a/dist/cleave-angular.js b/dist/cleave-angular.js
@@ -246,21 +246,22 @@ Cleave.prototype = {
     },
 
     getRawValue: function () {
-        var owner = this, 
+        var owner = this,
             pps = owner.properties,
             Util = Cleave.Util,
-            inputValue = owner.element.value,
-            rawValueTrimPrefix = owner.properties.rawValueTrimPrefix;
+            rawValue = owner.element.value;
 
-        if (rawValueTrimPrefix) {
-            inputValue = Util.getPrefixStrippedValue(inputValue, pps.prefix, pps.prefixLength);
+        if (pps.rawValueTrimPrefix) {
+            rawValue = Util.getPrefixStrippedValue(rawValue, pps.prefix, pps.prefixLength);
         }
 
         if (pps.numeral) {
-            return pps.numeralFormatter.getRawValue(inputValue);
+            rawValue = pps.numeralFormatter.getRawValue(rawValue);
+        } else {
+            rawValue = Util.stripDelimiters(rawValue, pps.delimiter, pps.delimiters);
         }
 
-        return Cleave.Util.stripDelimiters(inputValue, pps.delimiter, pps.delimiters);
+        return rawValue;
     },
 
     getFormattedValue: function () {
@@ -440,6 +441,7 @@ var DefaultProperties = {
 
         target.prefix = (target.creditCard || target.phone || target.date) ? '' : (opts.prefix || '');
         target.prefixLength = target.prefix.length;
+        target.rawValueTrimPrefix = !!opts.rawValueTrimPrefix;
 
         target.initValue = opts.initValue || '';
 
@@ -458,7 +460,6 @@ var DefaultProperties = {
 
         target.backspace = false;
         target.result = '';
-        target.rawValueTrimPrefix = opts.rawValueTrimPrefix || false;
 
         return target;
     }

diff --git a/dist/cleave-angular.min.js b/dist/cleave-angular.min.js
diff --git a/dist/cleave-react.js b/dist/cleave-react.js
@@ -200,16 +200,24 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	    onChange: function onChange(event) {
 	        var owner = this,
-	            pps = owner.properties;
+	            pps = owner.properties,
+	            rawValue;
 
 	        owner.onInput(event.target.value);
 
+	        rawValue = pps.result;
+
+	        if (pps.rawValueTrimPrefix) {
+	            rawValue = Util.getPrefixStrippedValue(rawValue, pps.prefix, pps.prefixLength);
+	        }
+
 	        if (pps.numeral) {
-	            event.target.rawValue = pps.numeralFormatter.getRawValue(pps.result);
+	            rawValue = pps.numeralFormatter.getRawValue(rawValue);
 	        } else {
-	            event.target.rawValue = Util.stripDelimiters(pps.result, pps.delimiter, pps.delimiters);
+	            rawValue = Util.stripDelimiters(rawValue, pps.delimiter, pps.delimiters);
 	        }
 
+	        event.target.rawValue = rawValue;
 	        event.target.value = pps.result;
 
 	        owner.registeredEvents.onChange(event);
@@ -893,6 +901,7 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	        target.prefix = target.creditCard || target.phone || target.date ? '' : opts.prefix || '';
 	        target.prefixLength = target.prefix.length;
+	        target.rawValueTrimPrefix = !!opts.rawValueTrimPrefix;
 
 	        target.initValue = opts.initValue || '';
 
@@ -906,7 +915,6 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	        target.backspace = false;
 	        target.result = '';
-	        target.rawValueTrimPrefix = opts.rawValueTrimPrefix || false;
 
 	        return target;
 	    }

diff --git a/dist/cleave-react.min.js b/dist/cleave-react.min.js
diff --git a/dist/cleave.js b/dist/cleave.js
@@ -246,21 +246,22 @@ Cleave.prototype = {
     },
 
     getRawValue: function () {
-        var owner = this, 
+        var owner = this,
             pps = owner.properties,
             Util = Cleave.Util,
-            inputValue = owner.element.value,
-            rawValueTrimPrefix = owner.properties.rawValueTrimPrefix;
+            rawValue = owner.element.value;
 
-        if (rawValueTrimPrefix) {
-            inputValue = Util.getPrefixStrippedValue(inputValue, pps.prefix, pps.prefixLength);
+        if (pps.rawValueTrimPrefix) {
+            rawValue = Util.getPrefixStrippedValue(rawValue, pps.prefix, pps.prefixLength);
         }
 
         if (pps.numeral) {
-            return pps.numeralFormatter.getRawValue(inputValue);
+            rawValue = pps.numeralFormatter.getRawValue(rawValue);
+        } else {
+            rawValue = Util.stripDelimiters(rawValue, pps.delimiter, pps.delimiters);
         }
 
-        return Cleave.Util.stripDelimiters(inputValue, pps.delimiter, pps.delimiters);
+        return rawValue;
     },
 
     getFormattedValue: function () {
@@ -440,6 +441,7 @@ var DefaultProperties = {
 
         target.prefix = (target.creditCard || target.phone || target.date) ? '' : (opts.prefix || '');
         target.prefixLength = target.prefix.length;
+        target.rawValueTrimPrefix = !!opts.rawValueTrimPrefix;
 
         target.initValue = opts.initValue || '';
 
@@ -458,7 +460,6 @@ var DefaultProperties = {
 
         target.backspace = false;
         target.result = '';
-        target.rawValueTrimPrefix = opts.rawValueTrimPrefix || false;
 
         return target;
     }

diff --git a/dist/cleave.min.js b/dist/cleave.min.js
diff --git a/doc/options.md b/doc/options.md
@@ -21,6 +21,7 @@
     - [delimiter](#delimiter)
     - [delimiters](#delimiters)
     - [prefix](#prefix)
+    - [rawValueTrimPrefix](#rawvaluetrimprefix)
     - [numericOnly](#numericonly)
     - [uppercase](#uppercase)
     - [lowercase](#lowercase)
@@ -288,6 +289,25 @@ new Cleave('.my-input', {
 // 253874 XXX XXX
 ```
 
+### `rawValueTrimPrefix`
+
+A `Boolean` value indicates if to trim prefix in calling `getRawValue()` or getting `rawValue` in AngularJS or ReactJS component.
+
+**Default value**: `false`
+
+```js
+new Cleave('.my-input', {
+    numeral: true,
+    prefix: '$',
+    rawValueTrimPrefix: true
+});
+```
+
+```js
+// formatted value: $123,456.78
+// raw value: 123456.78
+```
+
 ### `numericOnly`
 
 A `Boolean` value indicates if it only allows numeric letters (0-9).

diff --git a/package.json b/package.json
@@ -10,7 +10,7 @@
     "form",
     "input"
   ],
-  "version": "0.6.12",
+  "version": "0.6.14",
   "author": {
     "name": "Max Huang",
     "url": "http://github.com/nosir",

diff --git a/src/Cleave.js b/src/Cleave.js
@@ -244,21 +244,22 @@ Cleave.prototype = {
     },
 
     getRawValue: function () {
-        var owner = this, 
+        var owner = this,
             pps = owner.properties,
             Util = Cleave.Util,
-            inputValue = owner.element.value,
-            rawValueTrimPrefix = owner.properties.rawValueTrimPrefix;
+            rawValue = owner.element.value;
 
-        if (rawValueTrimPrefix) {
-            inputValue = Util.getPrefixStrippedValue(inputValue, pps.prefix, pps.prefixLength);
+        if (pps.rawValueTrimPrefix) {
+            rawValue = Util.getPrefixStrippedValue(rawValue, pps.prefix, pps.prefixLength);
         }
 
         if (pps.numeral) {
-            return pps.numeralFormatter.getRawValue(inputValue);
+            rawValue = pps.numeralFormatter.getRawValue(rawValue);
+        } else {
+            rawValue = Util.stripDelimiters(rawValue, pps.delimiter, pps.delimiters);
         }
 
-        return Cleave.Util.stripDelimiters(inputValue, pps.delimiter, pps.delimiters);
+        return rawValue;
     },
 
     getFormattedValue: function () {

diff --git a/src/Cleave.react.js b/src/Cleave.react.js
@@ -139,16 +139,24 @@ var Cleave = React.createClass({
     },
 
     onChange: function (event) {
-        var owner = this, pps = owner.properties;
+        var owner = this, pps = owner.properties,
+            rawValue;
 
         owner.onInput(event.target.value);
 
+        rawValue = pps.result;
+
+        if (pps.rawValueTrimPrefix) {
+            rawValue = Util.getPrefixStrippedValue(rawValue, pps.prefix, pps.prefixLength);
+        }
+
         if (pps.numeral) {
-            event.target.rawValue = pps.numeralFormatter.getRawValue(pps.result);
+            rawValue = pps.numeralFormatter.getRawValue(rawValue);
         } else {
-            event.target.rawValue = Util.stripDelimiters(pps.result, pps.delimiter, pps.delimiters);
+            rawValue = Util.stripDelimiters(rawValue, pps.delimiter, pps.delimiters);
         }
 
+        event.target.rawValue = rawValue;
         event.target.value = pps.result;
 
         owner.registeredEvents.onChange(event);

diff --git a/src/common/DefaultProperties.js b/src/common/DefaultProperties.js
@@ -42,6 +42,7 @@ var DefaultProperties = {
 
         target.prefix = (target.creditCard || target.phone || target.date) ? '' : (opts.prefix || '');
         target.prefixLength = target.prefix.length;
+        target.rawValueTrimPrefix = !!opts.rawValueTrimPrefix;
 
         target.initValue = opts.initValue || '';
 
@@ -60,7 +61,6 @@ var DefaultProperties = {
 
         target.backspace = false;
         target.result = '';
-        target.rawValueTrimPrefix = opts.rawValueTrimPrefix || false;
 
         return target;
     }