Changeset 29078

Timestamp:

07/10/2014 09:25:49 PM (12 years ago)

Author:

wonderboymusic

Message:

Media Grid: Screen Options for grid have to play nice with Screen Options for list. This was fun.

See #24716.

Location:

trunk/src

Files:

• wp-admin/includes/screen.php (modified) (1 diff)
• wp-admin/js/common.js (modified) (2 diffs)
• wp-includes/media-template.php (modified) (1 diff)

trunk/src/wp-admin/includes/screen.php

@@ -1079 +1079 @@
                 <?php elseif ( $this->get_option( 'media_grid_title' ) ): ?>
                         <div class="metabox-prefs media-grid-prefs">
-                        <?php foreach ( $this->_options as $column => $args ) {
+                        <?php
+                        $option = get_user_option( 'manageuploadgridcolumnshidden' );
+                        $hidden = array();
+                        if ( ! empty( $option ) ) {
+                                $hidden = $option;
+                        }
+                        foreach ( $this->_options as $column => $args ) {
                                 $id = "$column-hide";
                                 echo '<label for="' . $id . '">';

trunk/src/wp-admin/js/common.js

@@ -28 +28 @@
 
         saveManageColumnsState : function() {
-                var hidden = this.hidden();
+                var hidden, page;
                 if ( $( '#media_grid_title-hide' ).length ) {
                         hidden = [];
@@ -41 +41 @@
                                 }
                         } );
+                        page = pagenow + 'grid';
                         hidden = hidden.join( ',' );
-                }
+                } else {
+                        page = pagenow;
+                        hidden = this.hidden();
+                }
+                
                 $.post(ajaxurl, {
                         action: 'hidden-columns',
                         hidden: hidden,
                         screenoptionnonce: $('#screenoptionnonce').val(),
-                        page: pagenow
+                        page: page
                 });
         },

trunk/src/wp-includes/media-template.php

@@ -420 +420 @@
                 <div class="data-fields">
                 <?php
-                $hidden = get_hidden_columns( get_current_screen() );
+                $option = get_user_option( 'manageuploadgridcolumnshidden' );
+                $hidden = array();
+                if ( ! empty( $option ) ) {
+                        $hidden = $option;
+                }
                 $fields = array( 'title', 'uploadedTo', 'dateFormatted', 'mime' );
                 foreach ( $fields as $field ):