projects
/
roojs1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Roo/form/ComboBoxArray.js
[roojs1]
/
Roo
/
form
/
ComboBoxArray.js
diff --git
a/Roo/form/ComboBoxArray.js
b/Roo/form/ComboBoxArray.js
index
6ecd3e0
..
9534e3e
100644
(file)
--- a/
Roo/form/ComboBoxArray.js
+++ b/
Roo/form/ComboBoxArray.js
@@
-40,7
+40,8
@@
Roo.form.ComboBoxArray = function(config)
/**
* @event remove
* Fires when remove the value from the list
/**
* @event remove
* Fires when remove the value from the list
- * @param {Roo.form.ComboBox} combo This combo box
+ * @param {Roo.form.ComboBoxArray} _self This combo box array
+ * @param {Roo.form.ComboBoxArray.Item} item removed item
*/
'remove' : true
*/
'remove' : true
@@
-307,7
+308,7
@@
Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField,
}, this)
}
}, this)
}
- if (typeof(v) == 'object') {
+ if (typeof(v) == 'object'
) {
// then let's assume it's an array of objects..
Roo.each(v, function(l) {
this.addItem(l);
// then let's assume it's an array of objects..
Roo.each(v, function(l) {
this.addItem(l);
@@
-451,19
+452,21
@@
Roo.extend(Roo.form.ComboBoxArray.Item, Roo.BoxComponent, {
String.format('{0}',this.data[this.tipField])
);
String.format('{0}',this.data[this.tipField])
);
+ if(this.cb.disabled){
+ return;
+ }
+
this.el.child('img').on('click', this.remove, this);
},
remove : function()
{
this.el.child('img').on('click', this.remove, this);
},
remove : function()
{
- Roo.log(this);
this.cb.items.remove(this);
this.el.child('img').un('click', this.remove, this);
this.el.remove();
this.cb.updateHiddenEl();
this.cb.items.remove(this);
this.el.child('img').un('click', this.remove, this);
this.el.remove();
this.cb.updateHiddenEl();
- Roo.log('remove?????');
- this.cb.fireEvent('remove', this);
+ this.cb.fireEvent('remove', this.cb, this);
}
});
\ No newline at end of file
}
});
\ No newline at end of file