projects
/
roojs1
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7f09856
)
Roo/bootstrap/ComboBox.js
author
edward
<edward@roojs.com>
Tue, 17 Apr 2018 08:30:19 +0000
(16:30 +0800)
committer
edward
<edward@roojs.com>
Tue, 17 Apr 2018 08:30:19 +0000
(16:30 +0800)
Roo/bootstrap/ComboBox.js
patch
|
blob
|
history
diff --git
a/Roo/bootstrap/ComboBox.js
b/Roo/bootstrap/ComboBox.js
index
99f4540
..
d0cfafd
100644
(file)
--- a/
Roo/bootstrap/ComboBox.js
+++ b/
Roo/bootstrap/ComboBox.js
@@
-2836,7
+2836,11
@@
Roo.extend(Roo.bootstrap.ComboBox, Roo.bootstrap.TriggerField, {
var default_text = '-- SELECT --';
if(this.placeholder.length){
- default_text = this.placeholder + ' - ';
+ default_text = this.placeholder + ' -';
+ }
+
+ if(this.emptyTitle.length){
+ default_text = this.emptyTitle + ' -';
}
var opt = this.inputEl().createChild({