[ISSUE-322] Fix non leading + in phone number

nosir · Jul 19, 2018 · db35551 · db35551
1 parent 344c12b
commit db35551
Show file tree

Hide file tree

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

diff --git a/dist/cleave-angular.js b/dist/cleave-angular.js
@@ -1019,6 +1019,9 @@ return /******/ (function(modules) { // webpackBootstrap
 	        // only keep number and +
 	        phoneNumber = phoneNumber.replace(/[^\d+]/g, '');
 
+	        // strip non-leading +
+	        phoneNumber = phoneNumber.replace(/^\+/, 'B').replace(/\+/g, '').replace('B', '+');
+
 	        // strip delimiter
 	        phoneNumber = phoneNumber.replace(owner.delimiterRE, '');
 
@@ -1054,7 +1057,6 @@ return /******/ (function(modules) { // webpackBootstrap
 	module.exports = PhoneFormatter;
 
 
-
 /***/ }),
 /* 5 */
 /***/ (function(module, exports) {

diff --git a/dist/cleave-angular.min.js b/dist/cleave-angular.min.js
diff --git a/dist/cleave-react-node.js b/dist/cleave-react-node.js
@@ -2185,6 +2185,9 @@ return /******/ (function(modules) { // webpackBootstrap
 	        // only keep number and +
 	        phoneNumber = phoneNumber.replace(/[^\d+]/g, '');
 
+	        // strip non-leading +
+	        phoneNumber = phoneNumber.replace(/^\+/, 'B').replace(/\+/g, '').replace('B', '+');
+
 	        // strip delimiter
 	        phoneNumber = phoneNumber.replace(owner.delimiterRE, '');
 

diff --git a/dist/cleave-react-node.min.js b/dist/cleave-react-node.min.js
diff --git a/dist/cleave-react.js b/dist/cleave-react.js
@@ -2379,6 +2379,9 @@ return /******/ (function(modules) { // webpackBootstrap
 	        // only keep number and +
 	        phoneNumber = phoneNumber.replace(/[^\d+]/g, '');
 
+	        // strip non-leading +
+	        phoneNumber = phoneNumber.replace(/^\+/, 'B').replace(/\+/g, '').replace('B', '+');
+
 	        // strip delimiter
 	        phoneNumber = phoneNumber.replace(owner.delimiterRE, '');
 

diff --git a/dist/cleave-react.min.js b/dist/cleave-react.min.js
diff --git a/dist/cleave.js b/dist/cleave.js
@@ -962,6 +962,9 @@ return /******/ (function(modules) { // webpackBootstrap
 	        // only keep number and +
 	        phoneNumber = phoneNumber.replace(/[^\d+]/g, '');
 
+	        // strip non-leading +
+	        phoneNumber = phoneNumber.replace(/^\+/, 'B').replace(/\+/g, '').replace('B', '+');
+
 	        // strip delimiter
 	        phoneNumber = phoneNumber.replace(owner.delimiterRE, '');
 
@@ -997,7 +1000,6 @@ return /******/ (function(modules) { // webpackBootstrap
 	module.exports = PhoneFormatter;
 
 
-
 /***/ }),
 /* 5 */
 /***/ (function(module, exports) {

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": "1.4.1",
+  "version": "1.4.2",
    "files": [
     "src",
     "dist",

diff --git a/src/shortcuts/PhoneFormatter.js b/src/shortcuts/PhoneFormatter.js
@@ -22,6 +22,9 @@ PhoneFormatter.prototype = {
         // only keep number and +
         phoneNumber = phoneNumber.replace(/[^\d+]/g, '');
 
+        // strip non-leading +
+        phoneNumber = phoneNumber.replace(/^\+/, 'B').replace(/\+/g, '').replace('B', '+');
+
         // strip delimiter
         phoneNumber = phoneNumber.replace(owner.delimiterRE, '');
 
@@ -55,4 +58,3 @@ PhoneFormatter.prototype = {
 };
 
 module.exports = PhoneFormatter;
-
diff --git a/test/fixtures/phone.json b/test/fixtures/phone.json
@@ -5,6 +5,10 @@
         "+61491570156",
         "+61 491 570 156"
       ],
+      [
+        "+61+++491570156",
+        "+61 491 570 156"
+      ],
       [
         "0491570156",
         "0491 570 156"
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,7 +10,7 @@ @@
         "form",
         "input"
       ],
-      "version": "1.4.1",
+      "version": "1.4.2",
        "files": [
         "src",
         "dist",
@@ Expand Down @@