projects
/
roojs1
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4bcc8d3
)
Roo/bootstrap/ComboBox.js
author
Alan Knowles
<alan@roojs.com>
Thu, 29 Nov 2018 03:39:43 +0000
(11:39 +0800)
committer
Alan Knowles
<alan@roojs.com>
Thu, 29 Nov 2018 03:39:43 +0000
(11:39 +0800)
Roo/bootstrap/ComboBox.js
patch
|
blob
|
history
diff --git
a/Roo/bootstrap/ComboBox.js
b/Roo/bootstrap/ComboBox.js
index
7109594
..
90e9a5e
100644
(file)
--- a/
Roo/bootstrap/ComboBox.js
+++ b/
Roo/bootstrap/ComboBox.js
@@
-472,6
+472,7
@@
Roo.extend(Roo.bootstrap.ComboBox, Roo.bootstrap.TriggerField, {
var combobox = {
cls: 'roo-select2-container input-group roo-select2-container-multi',
cn: [
var combobox = {
cls: 'roo-select2-container input-group roo-select2-container-multi',
cn: [
+
box
// {
// tag: 'ul',
box
// {
// tag: 'ul',
@@
-2242,50
+2243,37
@@
Roo.extend(Roo.bootstrap.ComboBox, Roo.bootstrap.TriggerField, {
});
}
});
}
- var box = {
- tag: 'div',
- cn: [
- {
- tag: 'input',
- type : 'hidden',
- cls: 'form-hidden-field'
- },
- inputblock
- ]
-
- };
+
+ var ibwrap = inputblock;
if(this.multiple){
if(this.multiple){
- box = {
- tag: 'div',
- cn: [
- {
- tag: 'input',
- type : 'hidden',
- cls: 'form-hidden-field'
- },
+ ibwrap = {
+ tag: 'ul',
+ cls: 'roo-select2-choices',
+ cn:[
{
{
- tag: 'ul',
- cls: 'roo-select2-choices',
- cn:[
- {
- tag: 'li',
- cls: 'roo-select2-search-field',
- cn: [
+ tag: 'li',
+ cls: 'roo-select2-search-field',
+ cn: [
- inputblock
- ]
- }
+ inputblock
]
}
]
]
}
]
- }
- };
+ };
+
+
+ }
var combobox = {
cls: 'roo-select2-container input-group roo-touchview-combobox ',
var combobox = {
cls: 'roo-select2-container input-group roo-touchview-combobox ',
- cn: [
- box
+ cn: [
+ {
+ tag: 'input',
+ type : 'hidden',
+ cls: 'form-hidden-field'
+ },
+ ibwrap
]
};
]
};