diff options
author | Thomas Steur <thomas.steur@gmail.com> | 2016-09-30 02:03:13 +0300 |
---|---|---|
committer | Thomas Steur <thomas.steur@gmail.com> | 2016-09-30 02:03:13 +0300 |
commit | 43bd151e711d5c719cf89d2746c23da5e29dd264 (patch) | |
tree | af3c4969a64f759811a08c026b739b3d8e716435 /plugins/CoreHome/javascripts/broadcast.js | |
parent | 68fea796ef5a81cf7c5f4fb17508968ac898bb7c (diff) | |
parent | 7d115b50ecb1660175e64e4e546c72546fd56d69 (diff) |
Merge branch '2.x-dev' into 3.0-m09
Diffstat (limited to 'plugins/CoreHome/javascripts/broadcast.js')
-rw-r--r-- | plugins/CoreHome/javascripts/broadcast.js | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/plugins/CoreHome/javascripts/broadcast.js b/plugins/CoreHome/javascripts/broadcast.js index cab2525145..9034c9eef5 100644 --- a/plugins/CoreHome/javascripts/broadcast.js +++ b/plugins/CoreHome/javascripts/broadcast.js @@ -288,9 +288,10 @@ var broadcast = { * * @param {string} str url with parameters to be updated * @param {boolean} [showAjaxLoading] whether to show the ajax loading gif or not. + * @param {string} strHash additional parameters that should be updated on the hash * @return {void} */ - propagateNewPage: function (str, showAjaxLoading) { + propagateNewPage: function (str, showAjaxLoading, strHash) { // abort all existing ajax requests globalAjaxQueue.abort(); @@ -314,6 +315,13 @@ var broadcast = { } } + if (strHash && currentHashStr.length != 0) { + var params_hash_vals = strHash.split("&"); + for (var i = 0; i < params_hash_vals.length; i++) { + currentHashStr = broadcast.updateParamValue(params_hash_vals[i], currentHashStr); + } + } + // Now load the new page. var newUrl = currentSearchStr + currentHashStr; |