X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=roojs-debug.js;h=d32eded9fff0f6fb80e3060cefe823a05f1f9cde;hb=fbccee01a4b2d22f26b77caa256f18d8cff48524;hp=124b6dbe6fb0df019aacf5b8f5e94451fe255d50;hpb=9affe627d84d24aa70421c353870c36900fc42c1;p=roojs1 diff --git a/roojs-debug.js b/roojs-debug.js index 124b6dbe6f..d32eded9ff 100644 --- a/roojs-debug.js +++ b/roojs-debug.js @@ -42998,7 +42998,10 @@ Roo.extend(Roo.form.ComboNested, Roo.form.ComboBox, { } var rec = view.store.getAt(ix[0]); - this.setFromData(rec.data); + if (!this.isLoading) { + this.setFromData(rec.data); + } + var lw = Math.floor( ((this.listWidth * this.maxColumns || Math.max(this.wrap.getWidth(), this.minListWidth)) - this.list.getFrameWidth('lr')) / this.maxColumns @@ -43009,7 +43012,13 @@ Roo.extend(Roo.form.ComboNested, Roo.form.ComboBox, { this.views[opts.list+1].getEl().setHeight( this.innerLists[0].getHeight()); this.views[opts.list+1].getEl().setStyle({ display : dl ? 'block' : 'none' }); this.innerLists[opts.list+1].setHeight( this.innerLists[0].getHeight()); - this.list.setWidth(lw * (opts.list + (dl ? 2 : 1))); + this.list.setWidth(lw * (opts.list + (dl ? 2 : 1))); + + if (this.isLoading) { + this.selectActive(opts.list); + } + + }, onDoubleClick : function() { @@ -43052,7 +43061,9 @@ Roo.extend(Roo.form.ComboNested, Roo.form.ComboBox, { }); } return record; - } + }, + + function selectActive()