projects
/
roojs1
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
9a59b48
)
Roo/bootstrap/ComboBox.js
author
edward
<edward@roojs.com>
Tue, 17 Apr 2018 08:20:53 +0000
(16:20 +0800)
committer
edward
<edward@roojs.com>
Tue, 17 Apr 2018 08:20:53 +0000
(16:20 +0800)
Roo/bootstrap/ComboBox.js
patch
|
blob
|
history
diff --git
a/Roo/bootstrap/ComboBox.js
b/Roo/bootstrap/ComboBox.js
index
0e1d4e8
..
e24c54b
100644
(file)
--- a/
Roo/bootstrap/ComboBox.js
+++ b/
Roo/bootstrap/ComboBox.js
@@
-2833,7
+2833,7
@@
Roo.extend(Roo.bootstrap.ComboBox, Roo.bootstrap.TriggerField, {
if(this.allowBlank) {
- var default_text =
this.placeholder
;
+ var default_text =
(this.placeholder.length) ? this.placeholder : '-- SELECT --'
;
var opt = this.inputEl().createChild({
tag: 'option',