[Issue-136] Fix delimiter matching issue

nosir · Jul 2, 2017 · 5c6e92e · 5c6e92e
1 parent a72dcfa
commit 5c6e92e
Show file tree

Hide file tree

Showing 11 changed files with 107 additions and 16 deletions.
diff --git a/bower.json b/bower.json
@@ -8,7 +8,7 @@
     "form",
     "input"
   ],
-  "version": "0.7.22",
+  "version": "0.7.23",
   "author": {
     "name": "Max Huang",
     "email": "[email protected]",

diff --git a/dist/cleave-angular.js b/dist/cleave-angular.js
@@ -812,17 +812,23 @@ return /******/ (function(modules) { // webpackBootstrap
 	        });
 	    },
 
+	    getDelimiterREByDelimiter: function (delimiter) {
+	        return new RegExp(delimiter.replace(/([.?*+^$[\]\\(){}|-])/g, '\\$1'), 'g');
+	    },
+
 	    stripDelimiters: function (value, delimiter, delimiters) {
+	        var owner = this;
+
 	        // single delimiter
 	        if (delimiters.length === 0) {
-	            var delimiterRE = delimiter ? new RegExp('\\' + delimiter, 'g') : '';
+	            var delimiterRE = delimiter ? owner.getDelimiterREByDelimiter(delimiter) : '';
 
 	            return value.replace(delimiterRE, '');
 	        }
 
 	        // multiple delimiters
 	        delimiters.forEach(function (current) {
-	            value = value.replace(new RegExp('\\' + current, 'g'), '');
+	            value = value.replace(owner.getDelimiterREByDelimiter(current), '');
 	        });
 
 	        return value;

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
@@ -1963,17 +1963,23 @@ return /******/ (function(modules) { // webpackBootstrap
 	        });
 	    },
 
+	    getDelimiterREByDelimiter: function getDelimiterREByDelimiter(delimiter) {
+	        return new RegExp(delimiter.replace(/([.?*+^$[\]\\(){}|-])/g, '\\$1'), 'g');
+	    },
+
 	    stripDelimiters: function stripDelimiters(value, delimiter, delimiters) {
+	        var owner = this;
+
 	        // single delimiter
 	        if (delimiters.length === 0) {
-	            var delimiterRE = delimiter ? new RegExp('\\' + delimiter, 'g') : '';
+	            var delimiterRE = delimiter ? owner.getDelimiterREByDelimiter(delimiter) : '';
 
 	            return value.replace(delimiterRE, '');
 	        }
 
 	        // multiple delimiters
 	        delimiters.forEach(function (current) {
-	            value = value.replace(new RegExp('\\' + current, 'g'), '');
+	            value = value.replace(owner.getDelimiterREByDelimiter(current), '');
 	        });
 
 	        return value;

diff --git a/dist/cleave-react.min.js b/dist/cleave-react.min.js
diff --git a/dist/cleave.js b/dist/cleave.js
@@ -812,17 +812,23 @@ return /******/ (function(modules) { // webpackBootstrap
 	        });
 	    },
 
+	    getDelimiterREByDelimiter: function (delimiter) {
+	        return new RegExp(delimiter.replace(/([.?*+^$[\]\\(){}|-])/g, '\\$1'), 'g');
+	    },
+
 	    stripDelimiters: function (value, delimiter, delimiters) {
+	        var owner = this;
+
 	        // single delimiter
 	        if (delimiters.length === 0) {
-	            var delimiterRE = delimiter ? new RegExp('\\' + delimiter, 'g') : '';
+	            var delimiterRE = delimiter ? owner.getDelimiterREByDelimiter(delimiter) : '';
 
 	            return value.replace(delimiterRE, '');
 	        }
 
 	        // multiple delimiters
 	        delimiters.forEach(function (current) {
-	            value = value.replace(new RegExp('\\' + current, 'g'), '');
+	            value = value.replace(owner.getDelimiterREByDelimiter(current), '');
 	        });
 
 	        return value;

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.7.22",
+  "version": "0.7.23",
   "author": {
     "name": "Max Huang",
     "url": "http://github.com/nosir",

diff --git a/src/utils/Util.js b/src/utils/Util.js
@@ -22,17 +22,23 @@ var Util = {
         });
     },
 
+    getDelimiterREByDelimiter: function (delimiter) {
+        return new RegExp(delimiter.replace(/([.?*+^$[\]\\(){}|-])/g, '\\$1'), 'g');
+    },
+
     stripDelimiters: function (value, delimiter, delimiters) {
+        var owner = this;
+
         // single delimiter
         if (delimiters.length === 0) {
-            var delimiterRE = delimiter ? new RegExp('\\' + delimiter, 'g') : '';
+            var delimiterRE = delimiter ? owner.getDelimiterREByDelimiter(delimiter) : '';
 
             return value.replace(delimiterRE, '');
         }
 
         // multiple delimiters
         delimiters.forEach(function (current) {
-            value = value.replace(new RegExp('\\' + current, 'g'), '');
+            value = value.replace(owner.getDelimiterREByDelimiter(current), '');
         });
 
         return value;

diff --git a/test/fixtures/util.json b/test/fixtures/util.json
@@ -0,0 +1,53 @@
+{
+  "stripDelimiters": [
+    {
+      "params": [
+        "12-3",
+        "-",
+        []
+      ],
+      "expected": "123"
+    },
+    {
+      "params": [
+        "1203",
+        "0",
+        []
+      ],
+      "expected": "123"
+    },
+    {
+      "params": [
+        "1273",
+        "7",
+        []
+      ],
+      "expected": "123"
+    },
+    {
+      "params": [
+        "12-45 78|0",
+        "",
+        [
+          "-",
+          " ",
+          "|"
+        ]
+      ],
+      "expected": "1245780"
+    },
+    {
+      "params": [
+        "123456789",
+        "",
+        [
+          "3",
+          "5",
+          "7",
+          "9"
+        ]
+      ],
+      "expected": "12468"
+    }
+  ]
+}
diff --git a/test/unit/Util_spec.js b/test/unit/Util_spec.js
@@ -0,0 +1,14 @@
+var _ = require('underscore');
+var Util = require('../../src/utils/Util');
+var json = require('../fixtures/util.json');
+
+describe('Util', function () {
+  describe('stripDelimiters:', function () {
+    _.each(json.stripDelimiters, function (data) {
+      var params = data.params;
+      it('should strip delimiter for: ' + params[0] + ' to: ' + data.expected, function () {
+        Util.stripDelimiters(params[0], params[1], params[2]).should.eql(data.expected);
+      });
+    });
+  });
+});