Skip to content

Commit

Permalink
[bug-fix] Bump version and regenerate assets
Browse files Browse the repository at this point in the history
  • Loading branch information
nosir committed Jul 19, 2016
1 parent 4293ae7 commit 99c9ac9
Show file tree
Hide file tree
Showing 6 changed files with 49 additions and 23 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"form",
"input"
],
"version": "0.4.8",
"version": "0.4.9",
"author": {
"name": "Max Huang",
"email": "[email protected]",
Expand Down
26 changes: 18 additions & 8 deletions dist/cleave-react.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/cleave-react.min.js

Large diffs are not rendered by default.

34 changes: 25 additions & 9 deletions dist/cleave.js
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,8 @@ Cleave.prototype = {
// 1234*| -> hit backspace -> 123|
// case 2: last character is not delimiter which is:
// 12|34* -> hit backspace -> 1|34*

if (pps.backspace && value.slice(-1) !== pps.delimiter) {
// note: no need to apply this for numeral mode
if (!pps.numeral && pps.backspace && value.slice(-1) !== pps.delimiter) {
value = Util.headStr(value, value.length - 1);
}

Expand Down Expand Up @@ -240,9 +240,14 @@ Cleave.prototype = {
},

getRawValue: function () {
var owner = this, pps = owner.properties;
var owner = this, pps = owner.properties,
inputValue = owner.element.value;

return Cleave.Util.strip(owner.element.value, pps.delimiterRE);
if (pps.numeral) {
return pps.numeralFormatter.getRawValue(inputValue);
}

return Cleave.Util.strip(inputValue, pps.delimiterRE);
},

getFormattedValue: function () {
Expand Down Expand Up @@ -375,8 +380,13 @@ var DefaultProperties = {

target.initValue = opts.initValue || '';

target.delimiter = opts.delimiter || (target.date ? '/' : (target.numeral ? ',' : ' '));
target.delimiterRE = new RegExp('\\' + target.delimiter, 'g');
target.delimiter =
(opts.delimiter || opts.delimiter === '') ? opts.delimiter :
(opts.date ? '/' :
(opts.numeral ? ',' :
(opts.phone ? ' ' :
' ')));
target.delimiterRE = new RegExp('\\' + (target.delimiter || ' '), 'g');

target.blocks = opts.blocks || [];
target.blocksLength = target.blocks.length;
Expand Down Expand Up @@ -592,7 +602,8 @@ var NumeralFormatter = function (numeralDecimalMark,
owner.numeralDecimalMark = numeralDecimalMark || '.';
owner.numeralDecimalScale = numeralDecimalScale || 2;
owner.numeralThousandsGroupStyle = numeralThousandsGroupStyle || NumeralFormatter.groupStyle.thousand;
owner.delimiter = delimiter || ',';
owner.delimiter = (delimiter || delimiter === '') ? delimiter : ',';
owner.delimiterRE = delimiter ? new RegExp('\\' + delimiter, 'g') : '';
};

NumeralFormatter.groupStyle = {
Expand All @@ -602,6 +613,10 @@ NumeralFormatter.groupStyle = {
};

NumeralFormatter.prototype = {
getRawValue: function (value) {
return value.replace(this.delimiterRE, '').replace(this.numeralDecimalMark, '.');
},

format: function (value) {
var owner = this, parts, partInteger, partDecimal = '';

Expand Down Expand Up @@ -656,8 +671,9 @@ if (typeof module === 'object' && typeof module.exports === 'object') {
var PhoneFormatter = function (formatter, delimiter) {
var owner = this;

owner.delimiter = delimiter || ' ';
owner.delimiterRE = new RegExp('\\' + owner.delimiter, 'g');
owner.delimiter = (delimiter || delimiter === '') ? delimiter : ' ';
owner.delimiterRE = delimiter ? new RegExp('\\' + delimiter, 'g') : '';

owner.formatter = formatter;
};

Expand Down
Loading

0 comments on commit 99c9ac9

Please sign in to comment.