diff options
| author | Maria Staskova <masha@dhtmlx.com> | 2014-05-20 14:53:56 +0300 |
|---|---|---|
| committer | Maria Staskova <masha@dhtmlx.com> | 2014-05-20 14:53:56 +0300 |
| commit | 074750e6ee632990c5b9334473df0f8b4b65c000 (patch) | |
| tree | a4a93727ffdae161b9df42e93066c03cff980088 /codebase/connector.js | |
| parent | 8959cc7e4727f5e28f6d3d44b5124d364dab2253 (diff) | |
| parent | d5d7611f58fdbd5c49df78336c3856d747585c4e (diff) | |
| download | connector-php-074750e6ee632990c5b9334473df0f8b4b65c000.zip connector-php-074750e6ee632990c5b9334473df0f8b4b65c000.tar.gz connector-php-074750e6ee632990c5b9334473df0f8b4b65c000.tar.bz2 | |
Merge branch 'master' of 192.168.3.251:connector-php
Diffstat (limited to 'codebase/connector.js')
| -rw-r--r-- | codebase/connector.js | 11 |
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; |