ソースを参照

Merge branch '1.x' into 2.x

Robin Herbots 13 年 前
コミット
e69542d54f
1 ファイル変更2 行追加2 行削除
  1. 2 2
      js/jquery.inputmask.js

+ 2 - 2
js/jquery.inputmask.js

@@ -3,7 +3,7 @@
 * http://github.com/RobinHerbots/jquery.inputmask
 * Copyright (c) 2010 - 2013 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 2.1.0b
+* Version: 2.1.0c
 */
 
 (function ($) {
@@ -55,7 +55,7 @@
                     ALT: 18, BACKSPACE: 8, CAPS_LOCK: 20, COMMA: 188, COMMAND: 91, COMMAND_LEFT: 91, COMMAND_RIGHT: 93, CONTROL: 17, DELETE: 46, DOWN: 40, END: 35, ENTER: 13, ESCAPE: 27, HOME: 36, INSERT: 45, LEFT: 37, MENU: 93, NUMPAD_ADD: 107, NUMPAD_DECIMAL: 110, NUMPAD_DIVIDE: 111, NUMPAD_ENTER: 108,
                     NUMPAD_MULTIPLY: 106, NUMPAD_SUBTRACT: 109, PAGE_DOWN: 34, PAGE_UP: 33, PERIOD: 190, RIGHT: 39, SHIFT: 16, SPACE: 32, TAB: 9, UP: 38, WINDOWS: 91
                 },
-                ignorables: [9, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123] //specify keycodes which should not be considered in the keypress event
+                ignorables: [9, 13, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123] //specify keycodes which should not be considered in the keypress event
             },
             val: $.fn.val, //store the original jquery val function
             escapeRegex: function (str) {