Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2296859 by Mark Carver: Fixed [regression] Responsive classes not always added to table rows.

8.0.x
Alex Pott 2014-07-08 11:35:20 +01:00
parent a66922a49e
commit 5fe283cac6
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
core/includes/theme.inc
View File

@ -1561,7 +1561,13 @@ function template_preprocess_table(&$variables) {
if (!empty($variables['header'])) { if (!empty($variables['header'])) {
$ts = tablesort_init($variables['header']); $ts = tablesort_init($variables['header']);
// Use a separate index with responsive classes as headers
// may be associative.
$responsive_index = -1;
foreach ($variables['header'] as $col_key => $cell) { foreach ($variables['header'] as $col_key => $cell) {
// Increase the responsive index.
$responsive_index++;
if (!is_array($cell)) { if (!is_array($cell)) {
$cell_content = $cell; $cell_content = $cell;
$cell_attributes = new Attribute(); $cell_attributes = new Attribute();
@ -1583,10 +1589,10 @@ function template_preprocess_table(&$variables) {
// must be transferred to the content cells. // must be transferred to the content cells.
if (!empty($cell['class']) && is_array($cell['class'])) { if (!empty($cell['class']) && is_array($cell['class'])) {
if (in_array(RESPONSIVE_PRIORITY_MEDIUM, $cell['class'])) { if (in_array(RESPONSIVE_PRIORITY_MEDIUM, $cell['class'])) {
$responsive_classes[$col_key] = RESPONSIVE_PRIORITY_MEDIUM; $responsive_classes[$responsive_index] = RESPONSIVE_PRIORITY_MEDIUM;
} }
elseif (in_array(RESPONSIVE_PRIORITY_LOW, $cell['class'])) { elseif (in_array(RESPONSIVE_PRIORITY_LOW, $cell['class'])) {
$responsive_classes[$col_key] = RESPONSIVE_PRIORITY_LOW; $responsive_classes[$responsive_index] = RESPONSIVE_PRIORITY_LOW;
} }
} }
@ -1637,7 +1643,12 @@ function template_preprocess_table(&$variables) {
$variables['rows'][$row_key]['attributes'] = new Attribute($row_attributes); $variables['rows'][$row_key]['attributes'] = new Attribute($row_attributes);
$variables['rows'][$row_key]['cells'] = array(); $variables['rows'][$row_key]['cells'] = array();
if (!empty($cells)) { if (!empty($cells)) {
// Reset the responsive index.
$responsive_index = -1;
foreach ($cells as $col_key => $cell) { foreach ($cells as $col_key => $cell) {
// Increase the responsive index.
$responsive_index++;
if (!is_array($cell)) { if (!is_array($cell)) {
$cell_content = $cell; $cell_content = $cell;
$cell_attributes = array(); $cell_attributes = array();
@ -1665,8 +1676,8 @@ function template_preprocess_table(&$variables) {
} }
// Copy RESPONSIVE_PRIORITY_LOW/RESPONSIVE_PRIORITY_MEDIUM // Copy RESPONSIVE_PRIORITY_LOW/RESPONSIVE_PRIORITY_MEDIUM
// class from header to cell as needed. // class from header to cell as needed.
if (isset($responsive_classes[$col_key])) { if (isset($responsive_classes[$responsive_index])) {
$cell_attributes['class'][] = $responsive_classes[$col_key]; $cell_attributes['class'][] = $responsive_classes[$responsive_index];
} }
$variables['rows'][$row_key]['cells'][$col_key]['tag'] = $is_header ? 'th' : 'td'; $variables['rows'][$row_key]['cells'][$col_key]['tag'] = $is_header ? 'th' : 'td';

5
core/modules/system/src/Tests/Theme/TableTest.php
View File

@ -188,8 +188,11 @@ class TableTest extends DrupalUnitTestBase {
*/ */
public function testThemeTableResponsivePriority() { public function testThemeTableResponsivePriority() {
$header = array( $header = array(
array('data' => 1, 'class' => array(RESPONSIVE_PRIORITY_MEDIUM)), // Test associative header indices.
'associative_key' => array('data' => 1, 'class' => array(RESPONSIVE_PRIORITY_MEDIUM)),
// Test non-associative header indices.
array('data' => 2, 'class' => array(RESPONSIVE_PRIORITY_LOW)), array('data' => 2, 'class' => array(RESPONSIVE_PRIORITY_LOW)),
// Test no responsive priorities.
array('data' => 3), array('data' => 3),
); );
$rows = array(array(4, 5, 6)); $rows = array(array(4, 5, 6));