The branch, master has been updated via 49d95b557378475701c4e7987870bbf03e53e31e (commit) via 27ed977ce16340aaa6a1807ec1f91fa8fe6484f7 (commit) from f74b5775a4a5326ecd21290fe5f6c0e857f4045c (commit)

- Log ----------------------------------------------------------------- commit 49d95b557378475701c4e7987870bbf03e53e31e Merge: 27ed977ce16340aaa6a1807ec1f91fa8fe6484f7 f74b5775a4a5326ecd21290fe5f6c0e857f4045c Author: Madhura Jayaratne madhura.cj@gmail.com Date: Sat Mar 12 23:26:40 2011 +0530

Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin

commit 27ed977ce16340aaa6a1807ec1f91fa8fe6484f7 Author: Madhura Jayaratne madhura.cj@gmail.com Date: Sat Mar 12 23:25:07 2011 +0530

Fixed clashing between row marking and null checkbox of inline-edit

-----------------------------------------------------------------------

Summary of changes: js/functions.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/js/functions.js b/js/functions.js index 94221b1..8087dcc 100644 --- a/js/functions.js +++ b/js/functions.js @@ -594,7 +594,7 @@ $(document).ready(function() { */ $('tr.odd:not(.noclick), tr.even:not(.noclick)').live('click',function(e) { //do not trigger when clicked on anchor or inside input element (in inline editing mode) with exception of the first checkbox - if ($(e.target).is('a, a *')) { + if ($(e.target).parents('tr').find('td:nth(2)').hasClass('inline_edit_active')) { return; } // XXX: FF fires two click events for <label> (label and checkbox), so we need to handle this differently

hooks/post-receive