summaryrefslogtreecommitdiffstats
path: root/codebase
diff options
context:
space:
mode:
authorStanislau Wolski <stanislau.wolski@gmail.com>2014-01-16 14:44:42 +0300
committerStanislau Wolski <stanislau.wolski@gmail.com>2014-01-16 14:44:42 +0300
commitcfd03a2b553f9386f2357c7cbe3a0a5129611fc1 (patch)
tree14eaba926e0d9cd0614b28c96da45d68af200d25 /codebase
parent5b3548241ba093cfa5c0eee22499e4c160fffd1a (diff)
downloadconnector-php-cfd03a2b553f9386f2357c7cbe3a0a5129611fc1.zip
connector-php-cfd03a2b553f9386f2357c7cbe3a0a5129611fc1.tar.gz
connector-php-cfd03a2b553f9386f2357c7cbe3a0a5129611fc1.tar.bz2
[update] support of clist in the dhtmlxgrid
Diffstat (limited to 'codebase')
-rw-r--r--codebase/connector.js11
1 files changed, 8 insertions, 3 deletions
diff --git a/codebase/connector.js b/codebase/connector.js
index 69c5a02..0ee9648 100644
--- a/codebase/connector.js
+++ b/codebase/connector.js
@@ -83,7 +83,7 @@ if (window.dhtmlXGridObject && !dhtmlXGridObject.prototype._init_point_connector
if (!this._colls_loaded && this.cellType){
var ar=[];
for (var i=0; i < this.cellType.length; i++)
- if (this.cellType[i].indexOf("co")==0 || this._con_f_used[i]==2) ar.push(i);
+ if (this.cellType[i].indexOf("co")==0 || this.cellType[i].indexOf("clist")==0 || this._con_f_used[i]==2) ar.push(i);
if (ar.length)
arguments[0]+=(arguments[0].indexOf("?")!=-1?"&":"?")+"connector=true&dhx_colls="+ar.join(",");
}
@@ -120,8 +120,13 @@ if (window.dhtmlXGridObject && !dhtmlXGridObject.prototype._init_point_connector
} else
v[v.length]=val;
}
- if (opts.length)
- combo.addOption(opts);
+ if (opts.length){
+ if (combo)
+ combo.addOption(opts);
+ } else if (v.length && !combo)
+ if (this.registerCList)
+ this.registerCList(f*1, v);
+
if (this._con_f_used[f*1])
this._con_f_used[f*1]=v;