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
4887a6f
..
99f4540
100644
(file)
--- a/
Roo/bootstrap/ComboBox.js
+++ b/
Roo/bootstrap/ComboBox.js
@@
-2835,6
+2835,10
@@
Roo.extend(Roo.bootstrap.ComboBox, Roo.bootstrap.TriggerField, {
var default_text = '-- SELECT --';
+ if(this.placeholder.length){
+ default_text = this.placeholder + ' - ';
+ }
+
var opt = this.inputEl().createChild({
tag: 'option',
value : 0,