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
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',