projects
/
roojs1
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9cf7f12
)
Roo/bootstrap/ComboBox.js
author
john
<john@roojs.com>
Tue, 29 May 2018 05:52:15 +0000
(13:52 +0800)
committer
john
<john@roojs.com>
Tue, 29 May 2018 05:52:15 +0000
(13:52 +0800)
Roo/bootstrap/ComboBox.js
patch
|
blob
|
history
diff --git
a/Roo/bootstrap/ComboBox.js
b/Roo/bootstrap/ComboBox.js
index
59210c4
..
4d6be4a
100644
(file)
--- 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(){
* 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();
if(!this.isExpanded()){
return;
}
this.list.hide();
+ this.hasFocus = false;
+
if(this.tickable){
this.okBtn.hide();
if(this.tickable){
this.okBtn.hide();
@@
-1864,7
+1863,11
@@
Roo.extend(Roo.bootstrap.ComboBox, Roo.bootstrap.TriggerField, {
onSearchFieldClick : function(e)
{
onSearchFieldClick : function(e)
{
+ Roo.log('in???');
+ Roo.log([this.hasFocus, e.getTarget().nodeName.toLowerCase() ]);
+
if(this.hasFocus && !this.disabled && e.getTarget().nodeName.toLowerCase() != 'button'){
if(this.hasFocus && !this.disabled && e.getTarget().nodeName.toLowerCase() != 'button'){
+ Roo.log('onSearchFieldClick');
this.onTickableFooterButtonClick(e, false, false);
return;
}
this.onTickableFooterButtonClick(e, false, false);
return;
}