From: edward Date: Wed, 13 Apr 2016 04:34:06 +0000 (+0800) Subject: Roo/bootstrap/ComboBox.js X-Git-Url: http://git.roojs.org/?a=commitdiff_plain;h=b19c7159117363bf16718037044ddcd161edb3f0;p=roojs1 Roo/bootstrap/ComboBox.js --- diff --git a/Roo/bootstrap/ComboBox.js b/Roo/bootstrap/ComboBox.js index 8541475e9b..2dd8caf338 100644 --- a/Roo/bootstrap/ComboBox.js +++ b/Roo/bootstrap/ComboBox.js @@ -1278,8 +1278,6 @@ Roo.extend(Roo.bootstrap.ComboBox, Roo.bootstrap.TriggerField, { var rm = false; var _this = this; - - Roo.each(this.tickItems, function(v,k){ if(typeof(v) != 'undefined' && v[_this.valueField] == r.data[_this.valueField]){ @@ -1294,16 +1292,15 @@ Roo.extend(Roo.bootstrap.ComboBox, Roo.bootstrap.TriggerField, { return; } }); - Roo.log(this.tickItems); - Roo.log(rm); + if(rm){ return; } - Roo.log(this.tickItems); + if(this.fireEvent('tick', this, r, index, Roo.get(_this.view.getNodes(index, index)[0]).select('input', true).first().dom.checked) !== false){ - //this.tickItems.push(r.data); + this.tickItems.push(r.data); } - Roo.log(this.tickItems); + if(typeof(e) == 'undefined' && view == false){ Roo.get(_this.view.getNodes(index, index)[0]).select('input', true).first().dom.checked = true; }