sync

diff --git a/Roo/bootstrap/PhoneInput.js b/Roo/bootstrap/PhoneInput.js
index 7689bd4..a4ac17e 100644 (file)
--- a/Roo/bootstrap/PhoneInput.js
+++ b/Roo/bootstrap/PhoneInput.js
@@ -338,11 +338,11 @@ Roo.extend(Roo.bootstrap.PhoneInput, Roo.bootstrap.TriggerField,  {
         
         onViewScroll : function(e, t)
         {
-            if(this.view.el.getScroll().top == 0 ||this.view.el.getScroll().top < this.view.el.dom.scrollHeight - this.view.el.dom.clientHeight || !this.hasFocus || !this.append || this.hasQuery){
+            if(this.view.el.getScroll().top == 0 ||this.view.el.getScroll().top < this.view.el.dom.scrollHeight - this.view.el.dom.clientHeight || !this.hasFocus || !this.append){
                 return;
             }
             
-            this.hasQuery = true;
+            Roo.log('load ever??');
             
             this.loading = this.list.select('.loading', true).first();
             

diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js
index 66c459c..f419b0c 100644 (file)
--- a/roojs-bootstrap-debug.js
+++ b/roojs-bootstrap-debug.js
@@ -38267,11 +38267,11 @@ Roo.extend(Roo.bootstrap.PhoneInput, Roo.bootstrap.TriggerField,  {
         
         onViewScroll : function(e, t)
         {
-            if(this.view.el.getScroll().top == 0 ||this.view.el.getScroll().top < this.view.el.dom.scrollHeight - this.view.el.dom.clientHeight || !this.hasFocus || !this.append || this.hasQuery){
+            if(this.view.el.getScroll().top == 0 ||this.view.el.getScroll().top < this.view.el.dom.scrollHeight - this.view.el.dom.clientHeight || !this.hasFocus || !this.append){
                 return;
             }
             
-            this.hasQuery = true;
+            Roo.log('load ever??');
             
             this.loading = this.list.select('.loading', true).first();
             

diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js
index 994327f..cfa7946 100644 (file)
--- a/roojs-bootstrap.js
+++ b/roojs-bootstrap.js
@@ -1616,8 +1616,8 @@ this.list.on('mousemove',this.onViewMove,this);this.list.on('scroll',this.onView
 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);
 Roo.get(document).on('mousewheel',this.collapseIf,this);this.fireEvent('expand',this);},restrictHeight:function(){this.list.alignTo(this.inputEl(),this.listAlign);this.list.alignTo(this.inputEl(),this.listAlign);},onViewOver:function(e,t){if(this.inKeyMode){return;
 }var A=this.view.findItemFromChild(t);if(A){var B=this.view.indexOf(A);this.select(B,false);}},onViewClick:function(A,B,el,e){var C=this.view.getSelectedIndexes()[0];var r=this.store.getAt(C);if(r){this.onSelect(r,C);}if(B!==false&&!this.blockFocus){this.inputEl().focus();
-}},onViewMove:function(e,t){this.inKeyMode=false;},onViewScroll:function(e,t){if(this.view.el.getScroll().top==0||this.view.el.getScroll().top<this.view.el.dom.scrollHeight-this.view.el.dom.clientHeight||!this.hasFocus||!this.append||this.hasQuery){return;
-}this.hasQuery=true;this.loading=this.list.select('.loading',true).first();if(this.loading===null){this.list.createChild({tag:'div',cls:'loading roo-select2-more-results roo-select2-active',html:'Loading more results...'});this.loading=this.list.select('.loading',true).first();
+}},onViewMove:function(e,t){this.inKeyMode=false;},onViewScroll:function(e,t){if(this.view.el.getScroll().top==0||this.view.el.getScroll().top<this.view.el.dom.scrollHeight-this.view.el.dom.clientHeight||!this.hasFocus||!this.append){return;}Roo.log('load ever??');
+this.loading=this.list.select('.loading',true).first();if(this.loading===null){this.list.createChild({tag:'div',cls:'loading roo-select2-more-results roo-select2-active',html:'Loading more results...'});this.loading=this.list.select('.loading',true).first();
 this.loading.setVisibilityMode(Roo.Element.DISPLAY);this.loading.hide();}this.loading.show();return;},select:function(A,B){this.selectedIndex=A;this.view.select(A);if(B!==false){var el=this.view.getNode(A);if(el){this.list.scrollChildIntoView(el,false);}}
 },createList:function(){this.list=Roo.get(document.body).createChild({tag:'ul',cls:'typeahead typeahead-long dropdown-menu tel-list',style:'display:none'});this.list.setVisibilityMode(Roo.Element.DISPLAY).originalDisplay='block';;},collapseIf:function(e){var A=e.within(this.el);
 var B=e.within(this.list);var C=(Roo.get(e.getTarget()).id==this.list.id)?true:false;if(A||B||C){return;}this.collapse();},onSelect:function(A,B){if(this.fireEvent('beforeselect',this,A,B)!==false){this.setFlagClass(A.data.iso2);this.setDialCode(A.data.dialCode);