Skip to content

Commit

Permalink
Fixes #1584 same fix for CListView as already done for CGridView
Browse files Browse the repository at this point in the history
  • Loading branch information
mdomba committed Nov 9, 2012
1 parent 5ef789f commit 64d6b41
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Version 1.1.13 work in progress
- Bug #1485 CSort does not quote table alias when using CDbCriteria (undsoft)
- Bug #1499: Fixed CVarDumper highlighting "\" (antoncpu)
- Bug #1552: Fixed potential vulnerability in CJavaScript::encode(): $safe parameter didn't used to be passed to the recursive method calls (resurtm)
- Bug #1584: Fixed CGridView urls when enableHistory was used with "path" urlFormat (mdomba)
- Bug #1584: Fixed CGridView and CListView urls when enableHistory was used with "path" urlFormat (mdomba)
- Bug #1622: CLocale::getTerritory() used to return invalid territory name when locales (language tags) were specified without territory part (e.g. 'de', 'fr') (resurtm)
- Bug #1624: Requirements page now tries all other preferred languages when the most preferred one is missing (ArtVal)
- Bug #1646: CLocale::getTerritory() used to return invalid territory name when locales (language tags) were specified with script part (e.g. 'zh-Hans-CN', 'zh-Hant-HK') (resurtm)
Expand Down
6 changes: 3 additions & 3 deletions framework/zii/widgets/assets/listview/jquery.yiilistview.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@
if(settings.ajaxUpdate.length > 0) {
$(document).on('click.yiiListView', settings.updateSelector,function(){
if(settings.enableHistory && window.History.enabled) {
var url = $(this).attr('href'),
params = $.deparam.querystring(url);
var url = $(this).attr('href').split('?'),
params = $.deparam.querystring('?'+url[1]);

delete params[settings.ajaxVar];
window.History.pushState(null, document.title, decodeURIComponent($.param.querystring(url.substr(0, url.indexOf('?')), params)));
window.History.pushState(null, document.title, decodeURIComponent($.param.querystring(url[0], params)));
} else {
$.fn.yiiListView.update(id, {url: $(this).attr('href')});
}
Expand Down

0 comments on commit 64d6b41

Please sign in to comment.