fix non-decimal [refs:#307]

JsDaddy · Mar 25, 2019 · a95d5ec · a95d5ec
1 parent bf37b66
commit a95d5ec
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 16 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/app/ngx-mask/mask.directive.ts b/src/app/ngx-mask/mask.directive.ts
@@ -229,7 +229,8 @@ export class MaskDirective implements ControlValueAccessor {
                 //     return;
                 // }
                 this._maskService.maskIsShown = this._maskService.showMaskInInput();
-                if (el.setSelectionRange) {
+                if (el.setSelectionRange &&
+                    this._maskService.prefix + this._maskService.maskIsShown === el.value) {
                     el.focus();
                     el.setSelectionRange(posStart, posEnd);
                 }
@@ -255,9 +256,6 @@ export class MaskDirective implements ControlValueAccessor {
             e.preventDefault();
         }
         if (e.keyCode === 37 || e.keyCode === 8) {
-            if (e.keyCode === 37) {
-                el.selectionStart = (el.selectionEnd as number) - 1;
-            }
             if (
                 (el.selectionStart as number) <= this._maskService.prefix.length &&
                 (el.selectionEnd as number) <= this._maskService.prefix.length

diff --git a/src/app/ngx-mask/mask.service.ts b/src/app/ngx-mask/mask.service.ts
@@ -207,6 +207,17 @@ export class MaskService extends MaskApplierService {
         return new RegExp(specialCharactersForRemove.map((item: string) => `\\${item}`).join('|'), 'gi');
     }
     private _checkSymbols(result: string): string | number | undefined {
+        if ('dot_separator.2' === this.maskExpression ) {
+            // tslint:disable-next-line:max-line-length
+            return Number(this._removeMask(this._removeSufix(this._removePrefix(result)), this.maskSpecialCharacters).replace(
+                ',',
+                '.'
+            )).toFixed(2);
+        }
+        if ('comma_separator.2' === this.maskExpression) {
+            // tslint:disable-next-line:max-line-length
+            return Number(this._removeMask(this._removeSufix(this._removePrefix(result)), this.maskSpecialCharacters)).toFixed(2);
+        }
         if (this.isNumberValue) {
             return Number(this._removeMask(this._removeSufix(this._removePrefix(result)), this.maskSpecialCharacters));
         } else if (