浏览代码

Merge branch '1.x' into 2.x

Robin Herbots 12 年之前
父节点
当前提交
8da98db882
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      js/jquery.inputmask.js

+ 2 - 2
js/jquery.inputmask.js

@@ -683,7 +683,7 @@
                         return { "begin": 0, "end": 0 };
                         return { "begin": 0, "end": 0 };
                     }
                     }
                     if (npt.setSelectionRange) {
                     if (npt.setSelectionRange) {
-                        begin = android533 ? npt.selectionEnd : npt.selectionStart;
+                        begin = npt.selectionStart;
                         end = npt.selectionEnd;
                         end = npt.selectionEnd;
                     } else if (document.selection && document.selection.createRange) {
                     } else if (document.selection && document.selection.createRange) {
                         range = document.selection.createRange();
                         range = document.selection.createRange();
@@ -1063,7 +1063,7 @@
                             determineActiveMasksetIndex(buffer, pos.begin, activeMasksetIndex);
                             determineActiveMasksetIndex(buffer, pos.begin, activeMasksetIndex);
                             writeBuffer(input, buffer, isRTL ? checkVal(input, buffer, false) : pos.begin);
                             writeBuffer(input, buffer, isRTL ? checkVal(input, buffer, false) : pos.begin);
                         } else { //handle delete
                         } else { //handle delete
-                            var beginPos = pos.begin;
+                            var beginPos = android533 ? pos.end : pos.begin;
                             if (k == opts.keyCode.DELETE) {
                             if (k == opts.keyCode.DELETE) {
                                 if (beginPos < firstMaskPos)
                                 if (beginPos < firstMaskPos)
                                     beginPos = firstMaskPos;
                                     beginPos = firstMaskPos;