diff options
| author | mattab <matthieu.aubry@gmail.com> | 2013-05-12 10:09:22 +0400 |
|---|---|---|
| committer | mattab <matthieu.aubry@gmail.com> | 2013-05-12 10:09:22 +0400 |
| commit | d89a08b8b27ef9a7293e9f8cf351bedbd838e2cb (patch) | |
| tree | 0aa6a2e2233d8a3b77deefe97fb3e142592003a4 /themes | |
| parent | 263892f231da5f6e998342aef02f33aa7edf8622 (diff) | |
Fixes #3932
* you can now write browserCode==ff;referrerKeyword!= to select all visitors using firefox and that have a keyword set
* or you can write referrerKeyword==;browserCode==ff to select all visitors using firefox and that did not have any keyword set
Also fixes #3933
Refs #2135
* fixing last bugs with segment selector encoding (working on chrome + FF + opera) - I 'hope' it will work on iE...
Diffstat (limited to 'themes')
| -rw-r--r-- | themes/default/ajaxHelper.js | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/themes/default/ajaxHelper.js b/themes/default/ajaxHelper.js index f2e7e12a71..10b9459216 100644 --- a/themes/default/ajaxHelper.js +++ b/themes/default/ajaxHelper.js @@ -300,10 +300,19 @@ function ajaxHelper() { this._buildAjaxCall = function () { var that = this; + var parameters = this._mixinDefaultGetParams(this.getParams); + + var url = 'index.php?'; + // we took care of encoding &segment properly already, so we don't use $.param for it ($.param URL encodes the values) + if(parameters['segment']) { + url += 'segment=' + parameters['segment'] + '&'; + delete parameters['segment']; + } + url += $.param(parameters); var ajaxCall = { type: 'POST', async: this.async !== false, - url: 'index.php?' + $.param(this._mixinDefaultGetParams(this.getParams)), + url: url, dataType: this.format || 'json', error: this.errorCallback, success: function (response) { @@ -363,7 +372,7 @@ function ajaxHelper() { var defaultParams = { idSite: piwik.idSite || broadcast.getValueFromUrl('idSite'), period: piwik.period || broadcast.getValueFromUrl('period'), - segment: broadcast.getValueFromHash('segment', window.location.href) + segment: broadcast.getValueFromHash('segment', window.location.href.split('#')[1]) }; // never append token_auth to url |