diff options
| author | dmitry-radyno <dmitry.radyno@gmail.com> | 2012-11-20 11:10:28 +0200 |
|---|---|---|
| committer | dmitry-radyno <dmitry.radyno@gmail.com> | 2012-11-20 11:10:28 +0200 |
| commit | d0fee66569c8dbebb895aaa4d4becc6aa587775f (patch) | |
| tree | ea23b7e164709ce8630b974415eeac5909e278cf /codebase/connector.js | |
| parent | b1e405f48bd388b373a05aa29521098fc5171f34 (diff) | |
| parent | 189b1e09f2b23f10fccdca15bf74fdb36c229e1d (diff) | |
| download | connector-php-d0fee66569c8dbebb895aaa4d4becc6aa587775f.zip connector-php-d0fee66569c8dbebb895aaa4d4becc6aa587775f.tar.gz connector-php-d0fee66569c8dbebb895aaa4d4becc6aa587775f.tar.bz2 | |
Merge branch 'master' of 192.168.1.251:connector-php
Diffstat (limited to 'codebase/connector.js')
| -rw-r--r-- | codebase/connector.js | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/codebase/connector.js b/codebase/connector.js index 6192db6..69c5a02 100644 --- a/codebase/connector.js +++ b/codebase/connector.js @@ -21,9 +21,10 @@ if (window.dhtmlXGridObject && !dhtmlXGridObject.prototype._init_point_connector return combine_urls.call(this,url); }; var filtering_url=function(url,inds,vals){ + var chunks = []; for (var i=0; i<inds.length; i++) - inds[i]="dhx_filter["+inds[i]+"]="+encodeURIComponent(vals[i]); - this._connector_filter="&"+inds.join("&"); + chunks[i]="dhx_filter["+inds[i]+"]="+encodeURIComponent(vals[i]); + this._connector_filter="&"+chunks.join("&"); return combine_urls.call(this,url); }; this.attachEvent("onCollectValues",function(ind){ @@ -50,8 +51,12 @@ if (window.dhtmlXGridObject && !dhtmlXGridObject.prototype._init_point_connector return true; }); this.attachEvent("onFilterStart",function(a,b){ + var ss = this.getSortingState(); if (this._con_f_used.length){ + var self=this; this.clearAndLoad(filtering_url.call(this,this.xmlFileUrl,a,b)); + if (ss.length) + self.setSortImgState(true,ss[0],ss[1]); return false; } return true; |