Changeset 29079

Timestamp:

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

Author:

wonderboymusic

Message:

Media Grid: make registering Screen Options for non-list tables more generic.

See #24716.

Location:

trunk/src/wp-admin

Files:

• includes/screen.php (modified) (3 diffs)
• js/common.js (modified) (3 diffs)
• upload.php (modified) (1 diff)

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

@@ -1023 +1023 @@
             isset( $wp_meta_boxes[ $this->id ] )
             || $this->get_option( 'per_page' )
-            || $this->get_option( 'media_grid_title' )
+            || $this->get_option( 'misc_screen_options' )
             || ( $columns && empty( $columns['_title'] ) )
         ) : ?>
@@ -1077 +1077 @@
                 <br class="clear" />
             </div>
-        <?php elseif ( $this->get_option( 'media_grid_title' ) ): ?>
-            <div class="metabox-prefs media-grid-prefs">
+        <?php elseif ( $this->get_option( 'misc_screen_options' ) ):
+            $misc_options = $this->get_option( 'misc_screen_options' );
+        ?>
+            <div class="metabox-prefs misc-screen-options" data-id="<?php echo esc_attr( $misc_options['id'] ) ?>">
             <?php
-            $option = get_user_option( 'manageuploadgridcolumnshidden' );
+
+            $option = get_user_option( $misc_options['option'] );
             $hidden = array();
             if ( ! empty( $option ) ) {
@@ -1086 +1089 @@
             }
             foreach ( $this->_options as $column => $args ) {
+                if ( 'misc_screen_options' === $column ) {
+                    continue;
+                }
                 $id = "$column-hide";
                 echo '<label for="' . $id . '">';
-                $saved = str_replace( 'media_grid_', '', $column );
-                echo '<input class="hide-column-tog" name="' . $id . '" type="checkbox" id="' . $id . '" value="' . $column . '"' . checked( ! in_array( $saved, $hidden ), true, false ) . ' />';
+                echo '<input class="hide-column-tog" name="' . $id . '" type="checkbox" id="' . $id . '" value="' . $column . '"' . checked( ! in_array( $column, $hidden ), true, false ) . ' />';
                 echo $args['label'] . "</label>\n";
             } ?>

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

@@ -28 +28 @@
 
     saveManageColumnsState : function() {
-        var hidden, page;
-        if ( $( '#media_grid_title-hide' ).length ) {
+        var hidden, page, opts = $( '.misc-screen-options' );
+        if ( opts.length ) {
             hidden = [];
-            $( '.hide-column-tog', '.media-grid-prefs' ).each( function() {
-                var $el, field = this.value.replace( 'media_grid_', '' );
+            opts.find( '.hide-column-tog' ).each( function() {
+                var $el, field = this.value;
                 $el = $( '.data-' + field );
                 if ( ! this.checked ) {
@@ -41 +41 @@
                 }
             } );
-            page = pagenow + 'grid';
+            page = pagenow + opts.data( 'id' );
             hidden = hidden.join( ',' );
         } else {
@@ -47 +47 @@
             hidden = this.hidden();
         }
-        
+
         $.post(ajaxurl, {
             action: 'hidden-columns',

trunk/src/wp-admin/upload.php

@@ -27 +27 @@
     wp_localize_script( 'media-grid', 'mediaGridSettings', array( 'adminUrl' => parse_url( self_admin_url(), PHP_URL_PATH )  ) );
 
-    add_screen_option( 'media_grid_title', array( 'label' => __( 'Name' ) ) );
-    add_screen_option( 'media_grid_uploadedTo', array( 'label' => __( 'Uploaded To' ) ) );
-    add_screen_option( 'media_grid_dateFormatted', array( 'label' => __( 'Date' ) ) );
-    add_screen_option( 'media_grid_mime', array( 'label' => __( 'Mime-type' ) ) );
+    add_screen_option( 'misc_screen_options', array( 'option' => 'manageuploadgridcolumnshidden', 'id' => 'grid' ) );
+    add_screen_option( 'title', array( 'label' => __( 'Name' ) ) );
+    add_screen_option( 'uploadedTo', array( 'label' => __( 'Uploaded To' ) ) );
+    add_screen_option( 'dateFormatted', array( 'label' => __( 'Date' ) ) );
+    add_screen_option( 'mime', array( 'label' => __( 'Mime-type' ) ) );
 
     require_once( ABSPATH . 'wp-admin/admin-header.php' );