Merge pull request #14589 from btacordex/fix-table-headers-safari

Fix several issues with table headers in Safari
phpmyadmin · Aug 28, 2018 · 32b801c · 32b801c
2 parents 39790da + 0861e05
commit 32b801c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/js/sql.js b/js/sql.js
@@ -1056,14 +1056,18 @@ function rearrangeStickyColumns ($sticky_columns, $table_results) {
     var $originalHeader = $table_results.find('thead');
     var $originalColumns = $originalHeader.find('tr:first').children();
     var $clonedHeader = $originalHeader.clone();
+    var is_firefox = navigator.userAgent.indexOf('Firefox') > -1;
+    var is_safari = navigator.userAgent.indexOf('Safari') > -1;
     // clone width per cell
-    $clonedHeader.find('tr:first').children().width(function (i,val) {
+    $clonedHeader.find('tr:first').children().each(function (i) {
         var width = $originalColumns.eq(i).width();
-        var is_firefox = navigator.userAgent.indexOf('Firefox') > -1;
-        if (! is_firefox) {
+        if (! is_firefox && ! is_safari) {
             width += 1;
         }
-        return width;
+        $(this).width(width);
+        if (is_safari) {
+            $(this).css('min-width', width).css('max-width', width);
+        }
     });
     $sticky_columns.empty().append($clonedHeader);
 }

diff --git a/templates/display/results/comment_for_row.twig b/templates/display/results/comment_for_row.twig
@@ -1,6 +1,6 @@
 {% if comments_map[fields_meta.table] is defined
     and comments_map[fields_meta.table][fields_meta.name] is defined %}
-    <span class="tblcomment" title="{{ comments_map[fields_meta.table][fields_meta.name] }}">
+    <br><span class="tblcomment" title="{{ comments_map[fields_meta.table][fields_meta.name] }}">
         {% if comments_map[fields_meta.table][fields_meta.name]|length > limit_chars %}
             {{ comments_map[fields_meta.table][fields_meta.name]|slice(0, limit_chars) }}…
         {% else %}