From 4ee608efd45d56eff83d7ed039675699f1c8348e Mon Sep 17 00:00:00 2001 From: john Date: Tue, 29 May 2018 13:52:15 +0800 Subject: [PATCH] Roo/bootstrap/ComboBox.js --- Roo/bootstrap/ComboBox.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Roo/bootstrap/ComboBox.js b/Roo/bootstrap/ComboBox.js index 59210c42bf..4d6be4ad7b 100644 --- a/Roo/bootstrap/ComboBox.js +++ b/Roo/bootstrap/ComboBox.js @@ -1721,15 +1721,14 @@ Roo.extend(Roo.bootstrap.ComboBox, Roo.bootstrap.TriggerField, { * Hides the dropdown list if it is currently expanded. Fires the 'collapse' event on completion. */ collapse : function(){ - - this.hasFocus = false; - if(!this.isExpanded()){ return; } this.list.hide(); + this.hasFocus = false; + if(this.tickable){ this.okBtn.hide(); @@ -1864,7 +1863,11 @@ Roo.extend(Roo.bootstrap.ComboBox, Roo.bootstrap.TriggerField, { onSearchFieldClick : function(e) { + Roo.log('in???'); + Roo.log([this.hasFocus, e.getTarget().nodeName.toLowerCase() ]); + if(this.hasFocus && !this.disabled && e.getTarget().nodeName.toLowerCase() != 'button'){ + Roo.log('onSearchFieldClick'); this.onTickableFooterButtonClick(e, false, false); return; } -- 2.39.2