[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA4-282-g8e601dd

[Madhura Jayaratne]

The branch, master has been updated
       via  8e601dd9643fad25521bee9088bb4e1ed9a26f63 (commit)
       via  d2955a1f3592f077adacebdd7aef068df9c50c72 (commit)
      from  485c5d93a2cc199179c4f1a135a778c5bb3556b8 (commit)


- Log -----------------------------------------------------------------
commit 8e601dd9643fad25521bee9088bb4e1ed9a26f63
Merge: d2955a1f3592f077adacebdd7aef068df9c50c72 485c5d93a2cc199179c4f1a135a778c5bb3556b8
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date:   Tue Mar 15 01:00:21 2011 +0530

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

commit d2955a1f3592f077adacebdd7aef068df9c50c72
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date:   Tue Mar 15 00:59:16 2011 +0530

    Do not mark rows when clicked on anchor

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

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 8087dcc..3068c3e 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).parents('tr').find('td:nth(2)').hasClass('inline_edit_active')) {
+        if ($(e.target).is('a, a *') || $(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
-- 
phpMyAdmin