Fix angular-ui#188

add timeout for fix caret pasition if click placeholder part before mask
gazaret · Dec 16, 2016 · f9b75ab · f9b75ab
1 parent d84a811
commit f9b75ab
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/dist/mask.js b/dist/mask.js
@@ -1,7 +1,7 @@
 /*!
  * angular-ui-mask
  * https://github.com/angular-ui/ui-mask
- * Version: 1.8.7 - 2016-07-26T15:59:07.992Z
+ * Version: 1.8.7 - 2016-12-16T13:23:58.004Z
  * License: MIT
  */
 
@@ -59,7 +59,7 @@ angular.module('ui.mask', [])
                 return tempOptions;
             }];
         })
-        .directive('uiMask', ['uiMask.Config', function(maskConfig) {
+        .directive('uiMask', ['uiMask.Config', '$timeout', function(maskConfig, $timeout) {
                 function isFocused (elem) {
                   return elem === document.activeElement && (!document.hasFocus || document.hasFocus()) && !!(elem.type || elem.href || ~elem.tabIndex);
                 }
@@ -556,6 +556,8 @@ angular.module('ui.mask', [])
 
                             function eventHandler(e) {
                                 /*jshint validthis: true */
+                                var self = this;
+
                                 e = e || {};
                                 // Allows more efficient minification
                                 var eventWhich = e.which,
@@ -681,6 +683,13 @@ angular.module('ui.mask', [])
                                 }
                                 oldCaretPosition = caretPos;
                                 setCaretPosition(this, caretPos);
+
+                                $timeout(function() {
+                                    var caretPos = getCaretPosition(iElement[0]);
+                                    if(caretPos < caretPosMin) {
+                                        setCaretPosition(self, caretPosMin);
+                                    }
+                                }, 305);
                             }
 
                             function isValidCaretPosition(pos) {

diff --git a/dist/mask.min.js b/dist/mask.min.js
diff --git a/src/mask.js b/src/mask.js
@@ -49,7 +49,7 @@ angular.module('ui.mask', [])
                 return tempOptions;
             }];
         })
-        .directive('uiMask', ['uiMask.Config', function(maskConfig) {
+        .directive('uiMask', ['uiMask.Config', '$timeout', function(maskConfig, $timeout) {
                 function isFocused (elem) {
                   return elem === document.activeElement && (!document.hasFocus || document.hasFocus()) && !!(elem.type || elem.href || ~elem.tabIndex);
                 }
@@ -546,6 +546,8 @@ angular.module('ui.mask', [])
 
                             function eventHandler(e) {
                                 /*jshint validthis: true */
+                                var self = this;
+
                                 e = e || {};
                                 // Allows more efficient minification
                                 var eventWhich = e.which,
@@ -671,6 +673,13 @@ angular.module('ui.mask', [])
                                 }
                                 oldCaretPosition = caretPos;
                                 setCaretPosition(this, caretPos);
+
+                                $timeout(function() {
+                                    var caretPos = getCaretPosition(iElement[0]);
+                                    if(caretPos < caretPosMin) {
+                                        setCaretPosition(self, caretPosMin);
+                                    }
+                                }, 305);
                             }
 
                             function isValidCaretPosition(pos) {