ソースを参照

fix resolvealias reapply options

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

+ 5 - 4
jquery.inputmask.js

@@ -154,6 +154,7 @@ This plugin is based on the masked input plugin written by Josh Bush (digitalbus
                 if (aliasDefinition)
                 if (aliasDefinition)
                     if (!aliasDefinition.alias) {
                     if (!aliasDefinition.alias) {
                     $.extend(true, opts, aliasDefinition);  //merge alias definition in the options
                     $.extend(true, opts, aliasDefinition);  //merge alias definition in the options
+                    $.extend(true, opts, options);  //reapply extra given options
                     return true;
                     return true;
                 } else return ResolveAlias(aliasDefinition.alias); //alias is another alias
                 } else return ResolveAlias(aliasDefinition.alias); //alias is another alias
                 return false;
                 return false;
@@ -238,7 +239,7 @@ This plugin is based on the masked input plugin written by Josh Bush (digitalbus
                 }
                 }
 
 
                 if (c) { chrs += c; }
                 if (c) { chrs += c; }
-                return tests[testPos].fn != null ? tests[testPos].fn.test(chrs, buffer, pos) : false;
+                return tests[testPos].fn != null ? tests[testPos].fn.test(chrs, buffer, pos, opts) : false;
             }
             }
 
 
             function isMask(pos) {
             function isMask(pos) {
@@ -603,10 +604,10 @@ This plugin is based on the masked input plugin written by Josh Bush (digitalbus
                 //apply mask
                 //apply mask
                 lastPosition = checkVal(el, buffer, true);
                 lastPosition = checkVal(el, buffer, true);
                 if (document.activeElement === el) { //position the caret when in focus
                 if (document.activeElement === el) { //position the caret when in focus
-                  $input.addClass('focus.inputmask');
-                  caret(el, lastPosition);
+                    $input.addClass('focus.inputmask');
+                    caret(el, lastPosition);
                 } else if (opts.clearMaskOnLostFocus && el._valueGet() == _buffer.join(''))
                 } else if (opts.clearMaskOnLostFocus && el._valueGet() == _buffer.join(''))
-                      el._valueSet('');
+                    el._valueSet('');
 
 
                 //private functions
                 //private functions
                 function patchValueProperty(npt) {
                 function patchValueProperty(npt) {