From 0bea371b9f7c13c4f6c79b1117a7fdbbb5dd7385 Mon Sep 17 00:00:00 2001
From: john <john@roojs.com>
Date: Mon, 29 Oct 2018 16:20:37 +0800
Subject: [PATCH] Roo/bootstrap/PhoneInput.js roojs-bootstrap.js
 roojs-bootstrap-debug.js

---
 Roo/bootstrap/PhoneInput.js |  2 +-
 roojs-bootstrap-debug.js    | 16 +++++++++++++++-
 roojs-bootstrap.js          |  5 +++--
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/Roo/bootstrap/PhoneInput.js b/Roo/bootstrap/PhoneInput.js
index bc2877c748..ae99b8850d 100644
--- a/Roo/bootstrap/PhoneInput.js
+++ b/Roo/bootstrap/PhoneInput.js
@@ -295,7 +295,7 @@ Roo.extend(Roo.bootstrap.PhoneInput, Roo.bootstrap.TriggerField, {
             
             this.list.on('mouseover', this.onViewOver, this);
             this.list.on('mousemove', this.onViewMove, this);
-            this.inputEl().on("keyup", this.onKeyUp, this);
+            // this.inputEl().on("keyup", this.onKeyUp, this);
             this.inputEl().on("keypress", this.onKeyPress, this);
             
             this.tpl = '<li><a href="#"><div class="flag {iso2}"></div>{name} <span class="dial-code">+{dialCode}</span></a></li>';
diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js
index 7d7ab06be9..133b6dd55b 100644
--- a/roojs-bootstrap-debug.js
+++ b/roojs-bootstrap-debug.js
@@ -40138,7 +40138,8 @@ Roo.extend(Roo.bootstrap.PhoneInput, Roo.bootstrap.TriggerField, {
             
             this.list.on('mouseover', this.onViewOver, this);
             this.list.on('mousemove', this.onViewMove, this);
-            this.inputEl().on("keyup", this.onKeyUp, this);
+            // this.inputEl().on("keyup", this.onKeyUp, this);
+            this.inputEl().on("keypress", this.onKeyPress, this);
             
             this.tpl = '<li><a href="#"><div class="flag {iso2}"></div>{name} <span class="dial-code">+{dialCode}</span></a></li>';
 
@@ -40396,9 +40397,22 @@ Roo.extend(Roo.bootstrap.PhoneInput, Roo.bootstrap.TriggerField, {
             
             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());
         }
         
+        
+        
 });
 /**
  * @class Roo.bootstrap.MoneyField
diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js
index 1ac554c8c3..0ed5389b87 100644
--- a/roojs-bootstrap.js
+++ b/roojs-bootstrap.js
@@ -1645,7 +1645,7 @@ if(this.indicatorpos=='right'){I.cls='roo-required-indicator text-danger fa fa-l
 if(p){for(var i=0;i<p.length;i++){for(var j=0;j<this.allCountries.length;j++){if(this.allCountries[j].iso2==p[i]){var t=this.allCountries[j];this.allCountries.splice(j,1);this.allCountries.unshift(t);}}}}this.store.proxy.data={success:true,data:this.allCountries}
 ;return C;},initEvents:function(){this.createList();Roo.bootstrap.PhoneInput.superclass.initEvents.call(this);this.indicator=this.indicatorEl();this.flag=this.flagEl();this.dialCodeHolder=this.dialCodeHolderEl();this.trigger=this.el.select('div.flag-box',true).first();
 this.trigger.on("click",this.onTriggerClick,this,{preventDefault:true});var A=this;(function(){var lw=A.listWidth||Math.max(A.inputEl().getWidth(),A.minListWidth);A.list.setWidth(lw);}).defer(100);this.list.on('mouseover',this.onViewOver,this);this.list.on('mousemove',this.onViewMove,this);
-this.inputEl().on("keyup",this.onKeyUp,this);this.tpl='<li><a href="#"><div class="flag {iso2}"></div>{name} <span class="dial-code">+{dialCode}</span></a></li>';this.view=new Roo.View(this.list,this.tpl,{singleSelect:true,store:this.store,selectedClass:this.selectedClass}
+this.inputEl().on("keypress",this.onKeyPress,this);this.tpl='<li><a href="#"><div class="flag {iso2}"></div>{name} <span class="dial-code">+{dialCode}</span></a></li>';this.view=new Roo.View(this.list,this.tpl,{singleSelect:true,store:this.store,selectedClass:this.selectedClass}
 );this.view.on('click',this.onViewClick,this);this.setValue(this.defaultDialCode);},onTriggerClick:function(e){Roo.log('trigger click');if(this.disabled){return;}if(this.isExpanded()){this.collapse();this.hasFocus=false;}else{this.store.load({});this.hasFocus=true;
 this.expand();}},isExpanded:function(){return this.list.isVisible();},collapse:function(){if(!this.isExpanded()){return;}this.list.hide();Roo.get(document).un('mousedown',this.collapseIf,this);Roo.get(document).un('mousewheel',this.collapseIf,this);this.fireEvent('collapse',this);
 this.validate();},expand:function(){Roo.log('expand');if(this.isExpanded()||!this.hasFocus){return;}var lw=this.listWidth||Math.max(this.inputEl().getWidth(),this.minListWidth);this.list.setWidth(lw);this.list.show();this.restrictHeight();Roo.get(document).on('mousedown',this.collapseIf,this);
@@ -1658,7 +1658,8 @@ 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());}});
+},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());}});
 // 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;
-- 
2.39.2