X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=Roo%2Fbootstrap%2FComboBox.js;h=eeede96222848047ff82da9e4f260745f0b547cb;hb=944094b8b578f2cf81982a1b7f8a06b8a06a56c8;hp=dbfe5f87f9e7ac17c4186ec248c160bfb47ee75d;hpb=5a53e6d0de2bd62ae08c05718ab3bde126e51039;p=roojs1 diff --git a/Roo/bootstrap/ComboBox.js b/Roo/bootstrap/ComboBox.js index dbfe5f87f9..eeede96222 100644 --- a/Roo/bootstrap/ComboBox.js +++ b/Roo/bootstrap/ComboBox.js @@ -1143,7 +1143,7 @@ Roo.extend(Roo.bootstrap.ComboBox, Roo.bootstrap.TriggerField, { if(typeof(this.loading) !== 'undefined' && this.loading !== null){ this.loading.hide(); } - Roo.log(this.store.getCount()); + if(this.store.getCount() > 0){ this.expand(); @@ -1657,7 +1657,6 @@ Roo.extend(Roo.bootstrap.ComboBox, Roo.bootstrap.TriggerField, { if(this.lastQuery != q || this.alwaysQuery){ this.lastQuery = q; if(this.mode == 'local'){ - this.selectedIndex = -1; if(forceAll){ this.store.clearFilter(); @@ -1676,6 +1675,7 @@ Roo.extend(Roo.bootstrap.ComboBox, Roo.bootstrap.TriggerField, { this.onLoad(); + }else{ this.store.baseParams[this.queryParam] = q;