[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-1012-ga4c225e

[Marc Delisle]

The branch, master has been updated
       via  a4c225ebd40e761c19cbfebcde52e909f4d8b9a7 (commit)
      from  2dd20b23d8791a77901baab8f3e71492df339666 (commit)


- Log -----------------------------------------------------------------
commit a4c225ebd40e761c19cbfebcde52e909f4d8b9a7
Author: Marc Delisle <marc at infomarc.info>
Date:   Mon Dec 20 12:59:00 2010 -0500

    Reduce the name of this class

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

Summary of changes:
 js/sql.js                     |    8 ++++----
 libraries/display_tbl.lib.php |   10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/js/sql.js b/js/sql.js
index 822c7e8..de01953 100644
--- a/js/sql.js
+++ b/js/sql.js
@@ -352,14 +352,14 @@ $(document).ready(function() {
             /**
              * @var $input_siblings  Object referring to all inline editable events from same row
              */
-            var $input_siblings = $(this).parents('tbody').find('tr').find('.data_inline_edit:nth('+this_row_index+')');
+            var $input_siblings = $(this).parents('tbody').find('tr').find('.inline_edit:nth('+this_row_index+')');
             /**
              * @var where_clause    String containing the WHERE clause to select this row
              */
             var where_clause = $(this).parents('tbody').find('tr').find('.where_clause:nth('+this_row_index+')').val();
         }
         else {
-            var $input_siblings = $(this).parent('tr').find('.data_inline_edit');
+            var $input_siblings = $(this).parent('tr').find('.inline_edit');
             var where_clause = $(this).parent('tr').find('.where_clause').val();
         }
 
@@ -513,14 +513,14 @@ $(document).ready(function() {
             /**
              * @var $input_siblings  Object referring to all inline editable events from same row
              */
-            var $input_siblings = $this_td.parents('tbody').find('tr').find('.data_inline_edit:nth('+this_td_index+')');
+            var $input_siblings = $this_td.parents('tbody').find('tr').find('.inline_edit:nth('+this_td_index+')');
             /**
              * @var where_clause    String containing the WHERE clause to select this row
              */
             var where_clause = $this_td.parents('tbody').find('tr').find('.where_clause:nth('+this_td_index+')').val();
         }
         else {
-            var $input_siblings = $this_td.parent('tr').find('.data_inline_edit');
+            var $input_siblings = $this_td.parent('tr').find('.inline_edit');
             var where_clause = $this_td.parent('tr').find('.where_clause').val();
         }
 
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index 3e4844b..7bbd4d8 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -1070,7 +1070,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
     $vertical_display['data']       = array();
     $vertical_display['row_delete'] = array();
     // name of the class added to all inline editable elements
-    $data_inline_edit_class = 'data_inline_edit';
+    $inline_edit_class = 'inline_edit';
 
     // Correction University of Virginia 19991216 in the while below
     // Previous code assumed that all tables have keys, specifically that
@@ -1226,8 +1226,8 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
             $pointer = $i;
             $is_field_truncated = false;
             //If the previous column had blob data, we need to reset the class
-            // to $data_inline_edit_class
-            $class = 'data ' . $data_inline_edit_class . ' ' . $alternating_color_class;
+            // to $inline_edit_class
+            $class = 'data ' . $inline_edit_class . ' ' . $alternating_color_class;
 
             //  See if this column should get highlight because it's used in the
             //  where-query.
@@ -1312,7 +1312,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
                 // TEXT fields type so we have to ensure it's really a BLOB
                 $field_flags = PMA_DBI_field_flags($dt_result, $i);
 
-                // reset $class from $data_inline_edit_class to just 'data' 
+                // reset $class from $inline_edit_class to just 'data' 
                 // as we can't edit binary data
                 $class = 'data';
 
@@ -1353,7 +1353,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
             // g e o m e t r y
             } elseif ($meta->type == 'geometry') {
                 $geometry_text = PMA_handle_non_printable_contents('GEOMETRY', (isset($row[$i]) ? $row[$i] : ''), $transform_function, $transform_options, $default_function, $meta);
-                // reset $class from $data_inline_edit_class to 'data' 
+                // reset $class from $inline_edit_class to 'data' 
                 // as we can't edit geometry data
                 $class = 'data';
                 $vertical_display['data'][$row_no][$i]     =  PMA_buildValueDisplay($class, $condition_field, $geometry_text);


hooks/post-receive
-- 
phpMyAdmin