X-Git-Url: http://git.roojs.org/?p=roojs1;a=blobdiff_plain;f=roojs-ui-debug.js;h=5bfabbbc987d15cc31e774f200f49948cba962d4;hp=7eb4754113f3f0e0f058af9d6a45bcd1a367297e;hb=dc5d9380aff25134bf025953bdafe40b580337ff;hpb=f4700f0511a9842ccb588098b291c50d855ce574 diff --git a/roojs-ui-debug.js b/roojs-ui-debug.js index 7eb4754113..5bfabbbc98 100644 --- a/roojs-ui-debug.js +++ b/roojs-ui-debug.js @@ -19833,7 +19833,10 @@ Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField, * @cfg {String} hiddenName The hidden name of the field, often contains an comma seperated list of names */ hiddenName : false, - + /** + * @cfg {String} seperator The value seperator normally ',' + */ + seperator : ',', // private the array of items that are displayed.. items : false, @@ -20008,7 +20011,7 @@ Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField, this.items.each(function(f) { ar.push(f.data[idField]); }); - this.hiddenEl.dom.value = ar.join(','); + this.hiddenEl.dom.value = ar.join(this.seperator); this.validate(); }, @@ -20040,7 +20043,7 @@ Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField, // comma seperated at present.. this needs to allow JSON based encoding.. this.hiddenEl.value = v; var v_ar = []; - Roo.each(v.split(','), function(k) { + Roo.each(v.split(this.seperator), function(k) { Roo.log("CHECK " + this.valueField + ',' + k); var li = this.store.query(this.valueField, k); if (!li.length) { @@ -20079,10 +20082,9 @@ Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField, dv = typeof(dv) != 'string' ? '' : dv; - var keys = kv.split(','); - var display = dv.split(','); + var keys = kv.split(this.seperator); + var display = dv.split(this.seperator); for (var i = 0 ; i < keys.length; i++) { - add = {}; add[this.valueField] = keys[i]; add[this.displayField] = display[i]; @@ -20130,7 +20132,7 @@ Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField, originalValue.push(d[i][this.valueField]); } - return String(this.getValue()) !== String(originalValue.join(',')); + return String(this.getValue()) !== String(originalValue.join(this.seperator)); } @@ -33000,26 +33002,36 @@ Roo.extend(Roo.grid.Grid, Roo.util.Observable, { this.view.refresh(true); }, /** - * addColumn + * addColumns * Add's a column, default at the end.. - * @param {Object} column configuration see {@link Roo.grid.ColumnModel} + * @param {int} position to add (default end) + * @param {Array} of objects of column configuration see {@link Roo.grid.ColumnModel} */ - addColumn : function(cfg, pos) + addColumns : function(pos, ar) { - cfg.id = typeof(cfg.id) == 'undefined' ? Roo.id() : cfg.id; // don't normally use this.. - this.cm.lookup[cfg.id] = cfg; - if (typeof(pos) == 'undefined' || pos >= this.cm.config.length) { - this.cm.config.push(cfg); - this.view.refresh(true); - return; + + for (var i =0;i< ar.length;i++) { + var cfg = ar[i]; + cfg.id = typeof(cfg.id) == 'undefined' ? Roo.id() : cfg.id; // don't normally use this.. + this.cm.lookup[cfg.id] = cfg; } - // splice + + + if (typeof(pos) == 'undefined' || pos >= this.cm.config.length) { + pos = this.cm.config.length; //this.cm.config.push(cfg); + } pos = Math.max(0,pos); - this.cm.config.splice(pos, 0, cfg); + ar.unshift(0); + ar.unshift(pos); + this.cm.config.splice.apply(this.cm.config, ar); + + + + this.view.generateRules(this.cm); this.view.refresh(true); - } + },