From: john <john@roojs.com>
Date: Mon, 29 Oct 2018 08:23:37 +0000 (+0800)
Subject: Roo/bootstrap/PhoneInput.js
X-Git-Url: http://git.roojs.org/?p=roojs1;a=commitdiff_plain;h=01184063a94966dc03addb0e5b01a8898a7d885d

Roo/bootstrap/PhoneInput.js
roojs-bootstrap.js
roojs-bootstrap-debug.js
---

diff --git a/Roo/bootstrap/PhoneInput.js b/Roo/bootstrap/PhoneInput.js
index b5621f1490..6c4ea1de3a 100644
--- a/Roo/bootstrap/PhoneInput.js
+++ b/Roo/bootstrap/PhoneInput.js
@@ -547,14 +547,9 @@ Roo.extend(Roo.bootstrap.PhoneInput, Roo.bootstrap.TriggerField, {
         },
         
         onKeyUp : function(e){
-            
-            if(this.allowed.indexOf(String.fromCharCode(e.getCharCode())) === -1){
-                e.stopEvent();
-            }
+            this.setValue(this.getValue());
             
             Roo.log(this.getValue());
-            
-            this.setValue(this.getValue());
         },
         
         onKeyPress : function(e){
@@ -562,6 +557,8 @@ Roo.extend(Roo.bootstrap.PhoneInput, Roo.bootstrap.TriggerField, {
             if(this.allowed.indexOf(String.fromCharCode(e.getCharCode())) === -1){
                 e.stopEvent();
             }
+            
+            Roo.log(this.getValue());
         }
         
         
diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js
index 133b6dd55b..d398e3e34e 100644
--- a/roojs-bootstrap-debug.js
+++ b/roojs-bootstrap-debug.js
@@ -40390,14 +40390,9 @@ Roo.extend(Roo.bootstrap.PhoneInput, Roo.bootstrap.TriggerField, {
         },
         
         onKeyUp : function(e){
-            
-            if(this.allowed.indexOf(String.fromCharCode(e.getCharCode())) === -1){
-                e.stopEvent();
-            }
+            this.setValue(this.getValue());
             
             Roo.log(this.getValue());
-            
-            this.setValue(this.getValue());
         },
         
         onKeyPress : function(e){
@@ -40407,8 +40402,6 @@ Roo.extend(Roo.bootstrap.PhoneInput, Roo.bootstrap.TriggerField, {
             }
             
             Roo.log(this.getValue());
-            
-            this.setValue(this.getValue());
         }
         
         
diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js
index 0ed5389b87..32bd131eed 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<v.length;i++){var c=v.charAt(i);if(!isNaN(c)){B+=c;if(this.dialCodeMapping[B]){A=v.substr(1,i);}if(B.length==4){break;}}}return A;},reset:function(){this.setValue(this.defaultDialCode);this.validate();},hiddenEl:function(){return this.el.select('input.hidden-tel-input',true).first();
-},onKeyUp:function(e){if(this.allowed.indexOf(String.fromCharCode(e.getCharCode()))===-1){e.stopEvent();}Roo.log(this.getValue());this.setValue(this.getValue());},onKeyPress:function(e){if(this.allowed.indexOf(String.fromCharCode(e.getCharCode()))===-1){e.stopEvent();
-}Roo.log(this.getValue());this.setValue(this.getValue());}});
+},onKeyUp:function(e){this.setValue(this.getValue());Roo.log(this.getValue());},onKeyPress:function(e){if(this.allowed.indexOf(String.fromCharCode(e.getCharCode()))===-1){e.stopEvent();}Roo.log(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;