From c2ed5b170d0261af8feaefaaaefe639a792c747a Mon Sep 17 00:00:00 2001 From: Helen Hou-Sandi Date: Wed, 10 Jun 2015 19:46:39 +0000 Subject: [PATCH] List tables: Use a class instead of inline styles for hidden columns. fixes #32608. git-svn-id: https://develop.svn.wordpress.org/trunk@32724 602fd350-edb4-49c9-b593-d223f7449a82 --- .../includes/class-wp-links-list-table.php | 5 ++--- src/wp-admin/includes/class-wp-list-table.php | 15 ++++++--------- .../includes/class-wp-media-list-table.php | 5 ++--- .../includes/class-wp-ms-sites-list-table.php | 5 ++--- .../includes/class-wp-ms-themes-list-table.php | 13 +++++++------ .../includes/class-wp-ms-users-list-table.php | 5 ++--- .../includes/class-wp-plugins-list-table.php | 10 +++++----- .../includes/class-wp-posts-list-table.php | 5 ++--- .../includes/class-wp-users-list-table.php | 5 ++--- src/wp-admin/js/common.js | 4 ++-- 10 files changed, 32 insertions(+), 40 deletions(-) diff --git a/src/wp-admin/includes/class-wp-links-list-table.php b/src/wp-admin/includes/class-wp-links-list-table.php index 2a5ce13395..33da02b2ee 100644 --- a/src/wp-admin/includes/class-wp-links-list-table.php +++ b/src/wp-admin/includes/class-wp-links-list-table.php @@ -181,12 +181,11 @@ class WP_Links_List_Table extends WP_List_Table { $classes .= ' has-row-actions column-primary'; } - $style = ''; if ( in_array( $column_name, $hidden ) ) { - $style = ' style="display:none;"'; + $classes .= ' hidden'; } - $attributes = "class='$classes'$style"; + $attributes = "class='$classes'"; if ( 'cb' === $column_name ) { ?> diff --git a/src/wp-admin/includes/class-wp-list-table.php b/src/wp-admin/includes/class-wp-list-table.php index 641e863475..74a8b0022b 100644 --- a/src/wp-admin/includes/class-wp-list-table.php +++ b/src/wp-admin/includes/class-wp-list-table.php @@ -946,11 +946,9 @@ class WP_List_Table { foreach ( $columns as $column_key => $column_display_name ) { $class = array( 'manage-column', "column-$column_key" ); - $style = ''; - if ( in_array( $column_key, $hidden ) ) - $style = 'display:none;'; - - $style = ' style="' . $style . '"'; + if ( in_array( $column_key, $hidden ) ) { + $class[] = 'hidden'; + } if ( 'cb' == $column_key ) $class[] = 'check-column'; @@ -978,7 +976,7 @@ class WP_List_Table { if ( !empty( $class ) ) $class = "class='" . join( ' ', $class ) . "'"; - echo "$column_display_name"; + echo "$column_display_name"; } } @@ -1137,12 +1135,11 @@ class WP_List_Table { $classes .= ' has-row-actions column-primary'; } - $style = ''; if ( in_array( $column_name, $hidden ) ) { - $style = ' style="display:none;"'; + $classes .= ' hidden'; } - $attributes = "class='$classes'$style"; + $attributes = "class='$classes'"; if ( 'cb' == $column_name ) { echo ''; diff --git a/src/wp-admin/includes/class-wp-media-list-table.php b/src/wp-admin/includes/class-wp-media-list-table.php index 785051d1eb..ee066adcad 100644 --- a/src/wp-admin/includes/class-wp-media-list-table.php +++ b/src/wp-admin/includes/class-wp-media-list-table.php @@ -340,12 +340,11 @@ foreach ( $columns as $column_name => $column_display_name ) { $classes .= ' has-row-actions column-primary'; } - $style = ''; if ( in_array( $column_name, $hidden ) ) { - $style = ' style="display:none;"'; + $classes .= ' hidden'; } - $attributes = "class='$classes'$style"; + $attributes = "class='$classes'"; if ( 'cb' === $column_name ) { ?> diff --git a/src/wp-admin/includes/class-wp-ms-sites-list-table.php b/src/wp-admin/includes/class-wp-ms-sites-list-table.php index 9f15c3d60f..948decffdf 100644 --- a/src/wp-admin/includes/class-wp-ms-sites-list-table.php +++ b/src/wp-admin/includes/class-wp-ms-sites-list-table.php @@ -272,12 +272,11 @@ class WP_MS_Sites_List_Table extends WP_List_Table { $classes .= ' has-row-actions column-primary'; } - $style = ''; if ( in_array( $column_name, $hidden ) ) { - $style = ' style="display:none;"'; + $classes .= ' hidden'; } - $attributes = "class='$classes'$style"; + $attributes = "class='$classes'"; if ( 'cb' === $column_name ) { ?> diff --git a/src/wp-admin/includes/class-wp-ms-themes-list-table.php b/src/wp-admin/includes/class-wp-ms-themes-list-table.php index 5852ee055a..0a8a8ada9e 100644 --- a/src/wp-admin/includes/class-wp-ms-themes-list-table.php +++ b/src/wp-admin/includes/class-wp-ms-themes-list-table.php @@ -434,21 +434,22 @@ class WP_MS_Themes_List_Table extends WP_List_Table { list( $columns, $hidden, $sortable, $primary ) = $this->get_column_info(); foreach ( $columns as $column_name => $column_display_name ) { - $style = ''; - if ( in_array( $column_name, $hidden ) ) - $style = ' style="display:none;"'; + $extra_classes = ''; + if ( in_array( $column_name, $hidden ) ) { + $extra_classes .= ' hidden'; + } switch ( $column_name ) { case 'cb': echo "$checkbox"; break; case 'name': - echo "" . $theme->display('Name') . ""; + echo "" . $theme->display('Name') . ""; echo $this->row_actions($actions, true); echo ""; break; case 'description': - echo ""; + echo ""; if ( $theme->errors() ) { $pre = $status == 'broken' ? __( 'Broken Theme:' ) . ' ' : ''; echo '

' . $pre . $theme->errors()->get_error_message() . '

'; @@ -487,7 +488,7 @@ class WP_MS_Themes_List_Table extends WP_List_Table { break; default: - echo ""; + echo ""; /** * Fires inside each custom column of the Multisite themes list table. diff --git a/src/wp-admin/includes/class-wp-ms-users-list-table.php b/src/wp-admin/includes/class-wp-ms-users-list-table.php index d05a6f1e72..0ab08054bc 100644 --- a/src/wp-admin/includes/class-wp-ms-users-list-table.php +++ b/src/wp-admin/includes/class-wp-ms-users-list-table.php @@ -208,12 +208,11 @@ class WP_MS_Users_List_Table extends WP_List_Table { $classes .= ' column-primary'; } - $style = ''; if ( in_array( $column_name, $hidden ) ) { - $style = ' style="display:none;"'; + $classes .= ' hidden'; } - $attributes = "class='$classes'$style"; + $attributes = "class='$classes'"; if ( 'cb' === $column_name ){ ?> diff --git a/src/wp-admin/includes/class-wp-plugins-list-table.php b/src/wp-admin/includes/class-wp-plugins-list-table.php index f80db42312..9b12644585 100644 --- a/src/wp-admin/includes/class-wp-plugins-list-table.php +++ b/src/wp-admin/includes/class-wp-plugins-list-table.php @@ -582,9 +582,9 @@ class WP_Plugins_List_Table extends WP_List_Table { list( $columns, $hidden, $sortable, $primary ) = $this->get_column_info(); foreach ( $columns as $column_name => $column_display_name ) { - $style = ''; + $extra_classes = ''; if ( in_array( $column_name, $hidden ) ) { - $style = ' style="display:none;"'; + $extra_classes = ' hidden'; } switch ( $column_name ) { @@ -592,14 +592,14 @@ class WP_Plugins_List_Table extends WP_List_Table { echo "$checkbox"; break; case 'name': - echo "$plugin_name"; + echo "$plugin_name"; echo $this->row_actions( $actions, true ); echo ""; break; case 'description': $classes = 'column-description desc'; - echo " + echo "
$description
"; @@ -651,7 +651,7 @@ class WP_Plugins_List_Table extends WP_List_Table { default: $classes = "$column_name column-$column_name$class"; - echo ""; + echo ""; /** * Fires inside each custom column of the Plugins list table. diff --git a/src/wp-admin/includes/class-wp-posts-list-table.php b/src/wp-admin/includes/class-wp-posts-list-table.php index 9111f01526..15ba2b591c 100644 --- a/src/wp-admin/includes/class-wp-posts-list-table.php +++ b/src/wp-admin/includes/class-wp-posts-list-table.php @@ -722,12 +722,11 @@ class WP_Posts_List_Table extends WP_List_Table { $classes .= ' page-title'; // Special addition for title column } - $style = ''; if ( in_array( $column_name, $hidden ) ) { - $style = ' style="display:none;"'; + $classes .= ' hidden'; } - $attributes = "class='$classes'$style"; + $attributes = "class='$classes'"; if ( 'cb' === $column_name ) { ?> diff --git a/src/wp-admin/includes/class-wp-users-list-table.php b/src/wp-admin/includes/class-wp-users-list-table.php index d76c310975..7dbc866f19 100644 --- a/src/wp-admin/includes/class-wp-users-list-table.php +++ b/src/wp-admin/includes/class-wp-users-list-table.php @@ -415,12 +415,11 @@ class WP_Users_List_Table extends WP_List_Table { $classes .= ' num'; // Special case for that column } - $style = ''; if ( in_array( $column_name, $hidden ) ) { - $style = ' style="display:none;"'; + $classes .= ' hidden'; } - $attributes = "class='$classes'$style"; + $attributes = "class='$classes'"; if ( 'cb' === $column_name ) { $r .= "$checkbox"; diff --git a/src/wp-admin/js/common.js b/src/wp-admin/js/common.js index 8a32e9ffe3..4e819c4482 100644 --- a/src/wp-admin/js/common.js +++ b/src/wp-admin/js/common.js @@ -37,12 +37,12 @@ columns = { }, checked : function(column) { - $('.column-' + column).show(); + $('.column-' + column).removeClass( 'hidden' ); this.colSpanChange(+1); }, unchecked : function(column) { - $('.column-' + column).hide(); + $('.column-' + column).addClass( 'hidden' ); this.colSpanChange(-1); },