X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=Roo%2Fform%2FComboNested.js;h=e682c715266898c6737ee01c56abafbdb96daa42;hb=c79faa4dca1855256899674a186175c894b8686c;hp=8e2a95b31e4cbf7a5b05d5968db7edf5a594a6b3;hpb=e18e95da20cc29b6ade4fb98a00f73b8065391eb;p=roojs1 diff --git a/Roo/form/ComboNested.js b/Roo/form/ComboNested.js index 8e2a95b31e..e682c71526 100644 --- a/Roo/form/ComboNested.js +++ b/Roo/form/ComboNested.js @@ -136,7 +136,7 @@ Roo.extend(Roo.form.ComboNested, Roo.form.ComboBox, { { var lw = Math.floor( - ((this.listWidth * 3 || Math.max(this.wrap.getWidth(), this.minListWidth)) - this.list.getFrameWidth('lr')) / 3 + ((this.listWidth * this.maxColumns || Math.max(this.wrap.getWidth(), this.minListWidth)) - this.list.getFrameWidth('lr')) / this.maxColumns ); this.list.setWidth(lw); // default to '1' @@ -299,7 +299,7 @@ Roo.extend(Roo.form.ComboNested, Roo.form.ComboBox, { this.setFromData(rec.data); var lw = Math.floor( - ((this.listWidth * 3 || Math.max(this.wrap.getWidth(), this.minListWidth)) - this.list.getFrameWidth('lr')) / 3 + ((this.listWidth * this.maxColumns || Math.max(this.wrap.getWidth(), this.minListWidth)) - this.list.getFrameWidth('lr')) / this.maxColumns ); var data = typeof(rec.data.cn) == 'undefined' ? [] : rec.data.cn; var dl = typeof(data.data) != 'undefined' ? data.total : data.length; ///json is a nested response..