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:
fb6e8e4
)
Roo/bootstrap/ComboBox.js
author
edward
<edward@roojs.com>
Tue, 17 Apr 2018 08:29:56 +0000
(16:29 +0800)
committer
edward
<edward@roojs.com>
Tue, 17 Apr 2018 08:29:56 +0000
(16:29 +0800)
Roo/bootstrap/ComboBox.js
patch
|
blob
|
history
diff --git
a/Roo/bootstrap/ComboBox.js
b/Roo/bootstrap/ComboBox.js
index
e24c54b
..
99f4540
100644
(file)
--- a/
Roo/bootstrap/ComboBox.js
+++ b/
Roo/bootstrap/ComboBox.js
@@
-2833,7
+2833,11
@@
Roo.extend(Roo.bootstrap.ComboBox, Roo.bootstrap.TriggerField, {
if(this.allowBlank) {
- var default_text = (this.placeholder.length) ? this.placeholder : '-- SELECT --';
+ var default_text = '-- SELECT --';
+
+ if(this.placeholder.length){
+ default_text = this.placeholder + ' - ';
+ }
var opt = this.inputEl().createChild({
tag: 'option',