projects
/
roojs1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Roo/bootstrap/ComboBox.js
[roojs1]
/
Roo
/
bootstrap
/
ComboBox.js
diff --git
a/Roo/bootstrap/ComboBox.js
b/Roo/bootstrap/ComboBox.js
index
03ec8a7
..
eeede96
100644
(file)
--- a/
Roo/bootstrap/ComboBox.js
+++ b/
Roo/bootstrap/ComboBox.js
@@
-1514,9
+1514,9
@@
Roo.extend(Roo.bootstrap.ComboBox, Roo.bootstrap.TriggerField, {
if(this.tickable && this.editable){
this.restrictHeight();
-
//
return;
+ return;
}
- Roo.log(this.isExpanded());
+
this.collapse();
},
@@
-1730,7
+1730,6
@@
Roo.extend(Roo.bootstrap.ComboBox, Roo.bootstrap.TriggerField, {
this.hasFocus = false;
if(this.tickable){
-
this.okBtn.hide();
this.cancelBtn.hide();
this.trigger.show();