[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA4-378-g45926a3

Madhura Jayaratne madhuracj at users.sourceforge.net
Thu Mar 17 15:36:13 CET 2011


The branch, master has been updated
       via  45926a3a2dd93873ff942e98b2bebba5c3ab2bba (commit)
       via  a5116cd8cf349ae85986e6362e54b3d86f41c241 (commit)
       via  876fa8fd3d287457c4823606845450aaa4ff9198 (commit)
      from  351915f066a7d3db6b37b9cdcd2c59779f815917 (commit)


- Log -----------------------------------------------------------------
commit 45926a3a2dd93873ff942e98b2bebba5c3ab2bba
Merge: a5116cd8cf349ae85986e6362e54b3d86f41c241 351915f066a7d3db6b37b9cdcd2c59779f815917
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date:   Thu Mar 17 20:05:26 2011 +0530

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

commit a5116cd8cf349ae85986e6362e54b3d86f41c241
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date:   Thu Mar 17 19:59:22 2011 +0530

    Proper handling of marked and hover classes for inline edit.

commit 876fa8fd3d287457c4823606845450aaa4ff9198
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date:   Thu Mar 17 18:50:26 2011 +0530

    Fixed row marking for vertical mode Edit and Inline Edit 'td's.

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

Summary of changes:
 js/sql.js |   29 +++++++++++++++++------------
 1 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/js/sql.js b/js/sql.js
index 9fc8bb3..acd9c8d 100644
--- a/js/sql.js
+++ b/js/sql.js
@@ -64,7 +64,7 @@ function appendInlineAnchor() {
         // on the ModifyDeleteAtLeft and ModifyDeleteAtRight cfg parameters
         $('#table_results tr')
             .find('.edit_row_anchor')
-            .removeClass('.edit_row_anchor')
+            .removeClass('edit_row_anchor')
             .parent().each(function() {
             var $this_tr = $(this);
             var $cloned_tr = $this_tr.clone();
@@ -474,16 +474,13 @@ $(document).ready(function() {
                 $chg_submit.empty();
                 $chg_submit.append(data_vt);
 
-                var $this_row = $(this).parent().parent();
-                if(parseInt(pos) % 2 == 0) {
-                    $this_row.siblings("tr:eq(3) td:eq(" + pos + ")").removeClass("odd edit_row_anchor row_" + pos + " vpointer vmarker inline_edit_active").addClass("odd edit_row_anchor row_" + pos + " vpointer vmarker inline_edit_anchor");
+                var $this_row = $(this).parents('tr');
+                // changing inline_edit_active to inline_edit_anchor
+                $this_row.siblings("tr:eq(3) td:eq(" + pos + ")").removeClass("inline_edit_active").addClass("inline_edit_anchor");
 
-                    $this_row.siblings("tr:eq(3) td:eq(" + pos + ")").removeClass("odd edit_row_anchor row_" + pos + " vpointer vmarker inline_edit_active hover").addClass("odd edit_row_anchor row_" + pos + " vpointer vmarker inline_edit_anchor");
-                } else {
-                    $this_row.siblings("tr:eq(3) td:eq(" + pos + ")").removeClass("even edit_row_anchor row_" + pos + " vpointer vmarker inline_edit_active").addClass("even edit_row_anchor row_" + pos + " vpointer vmarker inline_edit_anchor");
+                // removing marked and hover classes.
+                $this_row.parent('tbody').find('tr').find("td:eq(" + pos + ")").removeClass("marked hover");
 
-                    $this_row.siblings("tr:eq(3) td:eq(" + pos + ")").removeClass("even edit_row_anchor row_" + pos + " vpointer vmarker inline_edit_active hover").addClass("even edit_row_anchor row_" + pos + " vpointer vmarker inline_edit_anchor");
-                }
                 for( var i = 6; i <= rows + 2; i++){
                     if( $this_row.siblings("tr:eq(" + i + ") td:eq(" + pos + ")").hasClass("inline_edit") == false) {
                         continue;
@@ -899,9 +896,17 @@ $(document).ready(function() {
                  }
 
                 PMA_ajaxShowMessage(data.message);
-                $this_td.removeClass('inline_edit_active hover').addClass('inline_edit_anchor');
-                $this_td.parent().removeClass('hover noclick');
-                $this_td.siblings().removeClass('hover');
+
+                // changing inline_edit_active to inline_edit_anchor
+                $this_td.removeClass('inline_edit_active').addClass('inline_edit_anchor');
+
+                // removing hover, marked and noclick classes
+                $this_td.parent('tr').removeClass('noclick');
+                if(disp_mode != 'vertical') {
+                    $this_td.parent('tr').removeClass('hover').find('td').removeClass('hover');
+                } else {
+                    $this_td.parents('tbody').find('tr').find('td:eq(' + $this_td.index() + ')').removeClass('marked');
+                }
 
                 $input_siblings.each(function() {
                     // Inline edit post has been successful.


hooks/post-receive
-- 
phpMyAdmin




More information about the Git mailing list