gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Fix several issues with table headers in Safari
This commit is contained in:
Isaac Bennetch 2018-08-28 09:44:17 -04:00 committed by GitHub
commit 32b801cce4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
js/sql.js
View File

@ -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);
}

2
templates/display/results/comment_for_row.twig
View File

@ -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 %}