<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[29079] trunk/src/wp-admin: Media Grid: make registering Screen Options for non-list tables more generic.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/29079">29079</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-07-10 21:43:49 +0000 (Thu, 10 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Media Grid: make registering Screen Options for non-list tables more generic.
See <a href="http://core.trac.wordpress.org/ticket/24716">#24716</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesscreenphp">trunk/src/wp-admin/includes/screen.php</a></li>
<li><a href="#trunksrcwpadminjscommonjs">trunk/src/wp-admin/js/common.js</a></li>
<li><a href="#trunksrcwpadminuploadphp">trunk/src/wp-admin/upload.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesscreenphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/screen.php (29078 => 29079)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/screen.php 2014-07-10 21:25:49 UTC (rev 29078)
+++ trunk/src/wp-admin/includes/screen.php 2014-07-10 21:43:49 UTC (rev 29079)
</span><span class="lines">@@ -1022,7 +1022,7 @@
</span><span class="cx"> <?php if (
</span><span class="cx"> isset( $wp_meta_boxes[ $this->id ] )
</span><span class="cx"> || $this->get_option( 'per_page' )
</span><del>- || $this->get_option( 'media_grid_title' )
</del><ins>+ || $this->get_option( 'misc_screen_options' )
</ins><span class="cx"> || ( $columns && empty( $columns['_title'] ) )
</span><span class="cx"> ) : ?>
</span><span class="cx"> <h5><?php _e( 'Show on screen' ); ?></h5>
</span><span class="lines">@@ -1076,19 +1076,24 @@
</span><span class="cx"> ?>
</span><span class="cx"> <br class="clear" />
</span><span class="cx"> </div>
</span><del>- <?php elseif ( $this->get_option( 'media_grid_title' ) ): ?>
- <div class="metabox-prefs media-grid-prefs">
</del><ins>+ <?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'] ) ?>">
</ins><span class="cx"> <?php
</span><del>- $option = get_user_option( 'manageuploadgridcolumnshidden' );
</del><ins>+
+ $option = get_user_option( $misc_options['option'] );
</ins><span class="cx"> $hidden = array();
</span><span class="cx"> if ( ! empty( $option ) ) {
</span><span class="cx"> $hidden = $option;
</span><span class="cx"> }
</span><span class="cx"> foreach ( $this->_options as $column => $args ) {
</span><ins>+ if ( 'misc_screen_options' === $column ) {
+ continue;
+ }
</ins><span class="cx"> $id = "$column-hide";
</span><span class="cx"> echo '<label for="' . $id . '">';
</span><del>- $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 ) . ' />';
</del><ins>+ echo '<input class="hide-column-tog" name="' . $id . '" type="checkbox" id="' . $id . '" value="' . $column . '"' . checked( ! in_array( $column, $hidden ), true, false ) . ' />';
</ins><span class="cx"> echo $args['label'] . "</label>\n";
</span><span class="cx"> } ?>
</span><span class="cx"> <br class="clear" />
</span></span></pre></div>
<a id="trunksrcwpadminjscommonjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/js/common.js (29078 => 29079)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/js/common.js 2014-07-10 21:25:49 UTC (rev 29078)
+++ trunk/src/wp-admin/js/common.js 2014-07-10 21:43:49 UTC (rev 29079)
</span><span class="lines">@@ -27,11 +27,11 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> saveManageColumnsState : function() {
</span><del>- var hidden, page;
- if ( $( '#media_grid_title-hide' ).length ) {
</del><ins>+ var hidden, page, opts = $( '.misc-screen-options' );
+ if ( opts.length ) {
</ins><span class="cx"> hidden = [];
</span><del>- $( '.hide-column-tog', '.media-grid-prefs' ).each( function() {
- var $el, field = this.value.replace( 'media_grid_', '' );
</del><ins>+ opts.find( '.hide-column-tog' ).each( function() {
+ var $el, field = this.value;
</ins><span class="cx"> $el = $( '.data-' + field );
</span><span class="cx"> if ( ! this.checked ) {
</span><span class="cx"> hidden.push( field );
</span><span class="lines">@@ -40,13 +40,13 @@
</span><span class="cx"> $el.removeClass( 'data-hidden' ).addClass( 'data-visible' );
</span><span class="cx"> }
</span><span class="cx"> } );
</span><del>- page = pagenow + 'grid';
</del><ins>+ page = pagenow + opts.data( 'id' );
</ins><span class="cx"> hidden = hidden.join( ',' );
</span><span class="cx"> } else {
</span><span class="cx"> page = pagenow;
</span><span class="cx"> hidden = this.hidden();
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> $.post(ajaxurl, {
</span><span class="cx"> action: 'hidden-columns',
</span><span class="cx"> hidden: hidden,
</span></span></pre></div>
<a id="trunksrcwpadminuploadphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/upload.php (29078 => 29079)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/upload.php 2014-07-10 21:25:49 UTC (rev 29078)
+++ trunk/src/wp-admin/upload.php 2014-07-10 21:43:49 UTC (rev 29079)
</span><span class="lines">@@ -26,10 +26,11 @@
</span><span class="cx"> wp_enqueue_script( 'media' );
</span><span class="cx"> wp_localize_script( 'media-grid', 'mediaGridSettings', array( 'adminUrl' => parse_url( self_admin_url(), PHP_URL_PATH ) ) );
</span><span class="cx">
</span><del>- 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' ) ) );
</del><ins>+ 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' ) ) );
</ins><span class="cx">
</span><span class="cx"> require_once( ABSPATH . 'wp-admin/admin-header.php' );
</span><span class="cx"> include( ABSPATH . 'wp-admin/admin-footer.php' );
</span></span></pre>
</div>
</div>
</body>
</html>