Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixes #2881: CGridView was blocking refresh on filter field change ev…

…ent after previous filtering using ENTER key
commit 8c30239dce366a70bc7486cd605c00c4938f0c9e 1 parent 78ede1c
@sivir sivir authored samdark committed
View
1  CHANGELOG
@@ -4,6 +4,7 @@
Version 1.1.17 work in progress
-------------------------------
+- Bug #2881: CGridView was blocking refresh on filter field change event after previous filtering using ENTER key (sivir)
- Bug #2921: Fixed CStatePersister read/write concurrency issue causing state data corruption (matteosistisette, samdark)
- Bug #3497: CErrorHandler messages for HTTP response codes were not matching RFCs (TeMPOraL)
- Bug #3637: Fixed not quoting primary key in count statements (applee)
View
7 framework/zii/widgets/assets/gridview/jquery.yiigridview.js
@@ -72,6 +72,7 @@
return this.each(function () {
var eventType,
+ eventTarget,
$grid = $(this),
id = $grid.attr('id'),
pagerSelector = '#' + id + ' .' + settings.pagerClass.replace(/\s+/g, '.') + ' a',
@@ -114,11 +115,13 @@
return; // only react to enter key
} else {
eventType = 'keydown';
+ eventTarget = event.target;
}
} else {
- // prevent processing for both keydown and change events
- if (eventType === 'keydown') {
+ // prevent processing for both keydown and change events on the same element
+ if (eventType === 'keydown' && eventTarget === event.target) {
eventType = '';
+ eventTarget = null;
return;
}
}
Please sign in to comment.
Something went wrong with that request. Please try again.