The branch, master has been updated via b5e733a2e34128b7e2a33a1b76c206c5de97584c (commit) via 82ac1e8028b5ec7d5b95e5cf2a2e47c452dfa5c5 (commit) from cce59ba0c88109a2ce123416d4166c8d19d28778 (commit)
- Log ----------------------------------------------------------------- commit b5e733a2e34128b7e2a33a1b76c206c5de97584c Merge: cce59ba0c88109a2ce123416d4166c8d19d28778 82ac1e8028b5ec7d5b95e5cf2a2e47c452dfa5c5 Author: Marc Delisle marc@infomarc.info Date: Tue Jun 7 11:10:18 2011 -0400
Merge branch 'QA_3_4'
-----------------------------------------------------------------------
Summary of changes: ChangeLog | 1 + js/sql.js | 4 ++-- libraries/display_tbl.lib.php | 3 +++ 3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog index 014c0c7..565b1d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,6 +21,7 @@ - bug #3304544 [parser] master is not a reserved word - bug #3307616 [edit] Inline edit updates multiple duplicate rows - patch #3311539 [edit] Inline edit does not escape backslashes +- bug #3313210 [interface] Columns class sometimes changed for nothing
3.4.2.0 (2011-06-07) - bug #3301249 [interface] Iconic table operations does not remove inline edit label diff --git a/js/sql.js b/js/sql.js index a165e4a..39ed84b 100644 --- a/js/sql.js +++ b/js/sql.js @@ -1145,14 +1145,14 @@ $(document).ready(function() { /** * vertical column highlighting in horizontal mode when hovering over the column header */ - $('.column_heading').live('hover', function() { + $('.column_heading.pointer').live('hover', function() { PMA_changeClassForColumn($(this), 'hover'); });
/** * vertical column marking in horizontal mode when clicking the column header */ - $('.column_heading').live('click', function() { + $('.column_heading.pointer').live('click', function() { PMA_changeClassForColumn($(this), 'marked'); }); }) diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index a16fc23..0ffbb9f 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -874,6 +874,9 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $ $th_class[] = 'condition'; } $th_class[] = 'column_heading'; + if ($GLOBALS['cfg']['BrowsePointerEnable'] == true) { + $th_class[] = 'pointer'; + } echo ' class="' . implode(' ', $th_class) . '"';
if ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped') {
hooks/post-receive