Fix merge conflicts

nosir · May 19, 2020 · 0935353 · 0935353
2 parents 3fbd8b5 + deb7274
commit 0935353
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 8 deletions.
diff --git a/dist/cleave-angular.js b/dist/cleave-angular.js
@@ -366,7 +366,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	        if (pps.prefix && (!pps.noImmediatePrefix || value.length)) {
 	            if (pps.tailPrefix) {
 	                value = value + pps.prefix;
-	            } else {
+	            } else if(value !== pps.prefix) {
 	                value = pps.prefix + value;
 	            }
 

diff --git a/dist/cleave-esm.js b/dist/cleave-esm.js
@@ -1,4 +1,4 @@
-var commonjsGlobal = typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
+var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
 
 var NumeralFormatter = function (numeralDecimalMark,
                                  numeralIntegerScale,
@@ -1361,7 +1361,7 @@ Cleave.prototype = {
         if (pps.prefix && (!pps.noImmediatePrefix || value.length)) {
             if (pps.tailPrefix) {
                 value = value + pps.prefix;
-            } else {
+            } else if(value !== pps.prefix) {
                 value = pps.prefix + value;
             }
 

diff --git a/dist/cleave-react-node.js b/dist/cleave-react-node.js
@@ -425,7 +425,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	        if (pps.prefix && (!pps.noImmediatePrefix || value.length)) {
 	            if (pps.tailPrefix) {
 	                value = value + pps.prefix;
-	            } else {
+	            } else if (value !== pps.prefix) {
 	                value = pps.prefix + value;
 	            }
 

diff --git a/dist/cleave-react.js b/dist/cleave-react.js
@@ -425,7 +425,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	        if (pps.prefix && (!pps.noImmediatePrefix || value.length)) {
 	            if (pps.tailPrefix) {
 	                value = value + pps.prefix;
-	            } else {
+	            } else if (value !== pps.prefix) {
 	                value = pps.prefix + value;
 	            }
 

diff --git a/dist/cleave.js b/dist/cleave.js
@@ -366,7 +366,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	        if (pps.prefix && (!pps.noImmediatePrefix || value.length)) {
 	            if (pps.tailPrefix) {
 	                value = value + pps.prefix;
-	            } else {
+	            } else if(value !== pps.prefix) {
 	                value = pps.prefix + value;
 	            }
 

diff --git a/src/Cleave.js b/src/Cleave.js
@@ -307,7 +307,7 @@ Cleave.prototype = {
         if (pps.prefix) {
             if (pps.tailPrefix) {
                 value = value + pps.prefix;
-            } else {
+            } else if(value !== pps.prefix) {
                 value = pps.prefix + value;
             }
 

diff --git a/src/Cleave.react.js b/src/Cleave.react.js
@@ -359,7 +359,7 @@ var cleaveReactClass = CreateReactClass({
         if (pps.prefix) {
             if (pps.tailPrefix) {
                 value = value + pps.prefix;
-            } else {
+            } else if (value !== pps.prefix) {
                 value = pps.prefix + value;
             }
 

diff --git a/test/browser/custom.js b/test/browser/custom.js
@@ -1,6 +1,8 @@
 describe('Custom input field', function () {
     var field = document.querySelector('.input-custom');
 
+    beforeEach(function(){ field.value = ''; });
+
     it('should use custom blocks', function () {
         var cleave = new Cleave(field, {
             blocks: [3, 3, 3]
@@ -82,6 +84,16 @@ describe('Custom input field', function () {
         assert.equal(field.value, 'UFO-123');
     });
 
+    it('should use defined prefix with noImmediatePrefix enabled', function() {
+        var cleave = new Cleave(field, {
+            prefix: 'GTM-',
+            noImmediatePrefix: true
+        });
+
+        cleave.setRawValue('1001');
+        assert.equal(cleave.getFormattedValue(), 'GTM-1001');
+    });
+
     it('should not trim prefix when rawValueTrimPrefix is not enabled', function () {
         var cleave = new Cleave(field, {
             prefix:             '$',