From: john Date: Mon, 29 Oct 2018 08:15:38 +0000 (+0800) Subject: Roo/bootstrap/PhoneInput.js X-Git-Url: http://git.roojs.org/?p=roojs1;a=commitdiff_plain;h=72a08668a50a7aa67dc8863904660871cafb0d37 Roo/bootstrap/PhoneInput.js roojs-bootstrap.js roojs-bootstrap-debug.js --- diff --git a/Roo/bootstrap/PhoneInput.js b/Roo/bootstrap/PhoneInput.js index 9797c2d204..a9da3c4343 100644 --- a/Roo/bootstrap/PhoneInput.js +++ b/Roo/bootstrap/PhoneInput.js @@ -550,16 +550,6 @@ Roo.extend(Roo.bootstrap.PhoneInput, Roo.bootstrap.TriggerField, { var k = e.getKey(); var c = e.getCharCode(); - if( - [",", "."].indexOf(String.fromCharCode(c)) > -1 || - this.allowed.indexOf(String.fromCharCode(c)) === -1 - ){ - e.stopEvent(); - } - - // if(!Roo.isIE && (e.isSpecialKey() || k == e.BACKSPACE || k == e.DELETE)){ - // return; - // } if(this.allowed.indexOf(String.fromCharCode(c)) === -1){ e.stopEvent(); } diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js index 273ed3378f..eec5e9551c 100644 --- a/roojs-bootstrap-debug.js +++ b/roojs-bootstrap-debug.js @@ -40393,18 +40393,6 @@ Roo.extend(Roo.bootstrap.PhoneInput, Roo.bootstrap.TriggerField, { var k = e.getKey(); var c = e.getCharCode(); - Roo.log(String.fromCharCode(c)); - - if( - [",", ".", "n"].indexOf(String.fromCharCode(c)) > -1 && - this.allowed.indexOf(String.fromCharCode(c)) === -1 - ){ - e.stopEvent(); - } - - // if(!Roo.isIE && (e.isSpecialKey() || k == e.BACKSPACE || k == e.DELETE)){ - // return; - // } if(this.allowed.indexOf(String.fromCharCode(c)) === -1){ e.stopEvent(); } diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js index af05b47e1a..ce99d51482 100644 --- a/roojs-bootstrap.js +++ b/roojs-bootstrap.js @@ -1658,8 +1658,7 @@ if(!d){return false;}return d;},setDialCode:function(v){this.dialCodeHolder.dom. }return v;},setValue:function(v){var d=this.getDialCode(v);if(v.length==0||!d||d.length==0){if(this.rendered){this.inputEl().dom.value=(v===null||v===undefined?'':v);this.hiddenEl().dom.value=(v===null||v===undefined?'':v);}return;}this.setFlagClass(this.dialCodeMapping[d].iso2); this.setDialCode(d);this.inputEl().dom.value=v.replace('+'+d,'');this.hiddenEl().dom.value=this.getValue();this.validate();},getDialCode:function(v){v=v||'';if(v.length==0){return this.dialCodeHolder.dom.value;}var A="";if(v.charAt(0)!="+"){return false;} var B="";for(var i=1;i-1&&this.allowed.indexOf(String.fromCharCode(c))===-1){e.stopEvent();}if(this.allowed.indexOf(String.fromCharCode(c))===-1){e.stopEvent(); -}this.setValue(this.getValue());}}); +},onKeyUp:function(e){var k=e.getKey();var c=e.getCharCode();if(this.allowed.indexOf(String.fromCharCode(c))===-1){e.stopEvent();}this.setValue(this.getValue());}}); // Roo/bootstrap/MoneyField.js Roo.bootstrap.MoneyField=function(A){Roo.bootstrap.MoneyField.superclass.constructor.call(this,A);};Roo.extend(Roo.bootstrap.MoneyField,Roo.bootstrap.ComboBox,{allowDecimals:true,decimalSeparator:".",decimalPrecision:0,allowNegative:true,allowZero:true,minValue:Number.NEGATIVE_INFINITY,maxValue:Number.MAX_VALUE,minText:"The minimum value for this field is {0}",maxText:"The maximum value for this field is {0}",nanText:"{0} is not a valid number",castInt:true,defaultCurrency:false,thousandsDelimiter:false,max_length:false,inputlg:9,inputmd:9,inputsm:9,inputxs:6,store:false,getAutoCreate:function(){var A=this.labelAlign||this.parentLabelAlign(); var id=Roo.id();var B={cls:'form-group',cn:[]};var C={tag:'input',id:id,cls:'form-control roo-money-amount-input',autocomplete:'new-password'};var D={tag:'input',type:'hidden',id:Roo.id(),cls:'hidden-number-input'};if(this.max_length){C.maxlength=this.max_length;