<!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>[31562] trunk/src: Persist search terms across grid/list modes:</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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/31562">31562</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/31562","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>wonderboymusic</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-02-26 23:00:20 +0000 (Thu, 26 Feb 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Persist search terms across grid/list modes:
* In `grid` mode, when the page loads and `s` is in the URL, all attachments are loaded and then the search value is set, which will filter the attachments. If the page loads with the attachments already filtered, the library will have to be requery'd to get the full set, which will require weirder code.
* When a user searches, the mode-switcher link for `list` view is updated dynamically to represent the current `location.href` in the proper `mode=` and `s=` context.
Fixes <a href="https://core.trac.wordpress.org/ticket/30583">#30583</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminuploadphp">trunk/src/wp-admin/upload.php</a></li>
<li><a href="#trunksrcwpincludesjsmediagridjs">trunk/src/wp-includes/js/media/grid.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsframemanagejs">trunk/src/wp-includes/js/media/views/frame/manage.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminuploadphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/upload.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/upload.php 2015-02-26 21:16:02 UTC (rev 31561)
+++ trunk/src/wp-admin/upload.php 2015-02-26 23:00:20 UTC (rev 31562)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,7 +25,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_script( 'media-grid' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_script( 'media' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $vars = wp_edit_attachments_query_vars();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $q = $_GET;
+ // let JS handle this
+ unset( $q['s'] );
+ $vars = wp_edit_attachments_query_vars( $q );
</ins><span class="cx" style="display: block; padding: 0 10px"> $ignore = array( 'mode', 'post_type', 'post_status', 'posts_per_page' );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $vars as $key => $value ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $value || in_array( $key, $ignore ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -67,7 +70,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> require_once( ABSPATH . 'wp-admin/admin-header.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="wrap" id="wp-media-grid">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="wrap" id="wp-media-grid" data-search="<?php _admin_search_query() ?>">
</ins><span class="cx" style="display: block; padding: 0 10px"> <h2>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> echo esc_html( $title );
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediagridjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/grid.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/grid.js 2015-02-26 21:16:02 UTC (rev 31561)
+++ trunk/src/wp-includes/js/media/grid.js 2015-02-26 23:00:20 UTC (rev 31562)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -682,15 +682,42 @@
</span><span class="cx" style="display: block; padding: 0 10px"> this.createStates();
</span><span class="cx" style="display: block; padding: 0 10px"> this.bindRegionModeHandlers();
</span><span class="cx" style="display: block; padding: 0 10px"> this.render();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.bindSearchHandler();
+ },
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * The views must interact with form controls that are not part of a frame
+ */
+ bindSearchHandler: function() {
+ var search = this.$( '#media-search-input' ),
+ currentSearch = this.options.container.data( 'search' ),
+ searchView = this.browserView.toolbar.get( 'search' ).$el,
+ listMode = this.$( '.view-list' ),
+
+ input = _.debounce( function (e) {
+ var val = $( e.currentTarget ).val(),
+ url = '';
+
+ if ( val ) {
+ url += '?search=' + val;
+ }
+ this.gridRouter.navigate( this.gridRouter.baseUrl( url ) );
+ }, 1000 );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Update the URL when entering search string (at most once per second)
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $( '#media-search-input' ).on( 'input', _.debounce( function(e) {
- var val = $( e.currentTarget ).val(), url = '';
- if ( val ) {
- url += '?search=' + val;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ search.on( 'input', _.bind( input, this ) );
+ searchView.val( currentSearch ).trigger( 'input' );
+
+ this.gridRouter.on( 'route:search', function () {
+ var href = window.location.href;
+ if ( href.indexOf( 'mode=' ) > -1 ) {
+ href = href.replace( /mode=[^&]+/g, 'mode=list' );
+ } else {
+ href += href.indexOf( '?' ) > -1 ? '&mode=list' : '?mode=list';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- self.gridRouter.navigate( self.gridRouter.baseUrl( url ) );
- }, 1000 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ href = href.replace( 'search=', 's=' );
+ listMode.prop( 'href', href );
+ } );
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsframemanagejs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views/frame/manage.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/frame/manage.js 2015-02-26 21:16:02 UTC (rev 31561)
+++ trunk/src/wp-includes/js/media/views/frame/manage.js 2015-02-26 23:00:20 UTC (rev 31562)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -83,15 +83,39 @@
</span><span class="cx" style="display: block; padding: 0 10px"> this.createStates();
</span><span class="cx" style="display: block; padding: 0 10px"> this.bindRegionModeHandlers();
</span><span class="cx" style="display: block; padding: 0 10px"> this.render();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.bindSearchHandler();
+ },
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ bindSearchHandler: function() {
+ var search = this.$( '#media-search-input' ),
+ currentSearch = this.options.container.data( 'search' ),
+ searchView = this.browserView.toolbar.get( 'search' ).$el,
+ listMode = this.$( '.view-list' ),
+
+ input = _.debounce( function (e) {
+ var val = $( e.currentTarget ).val(),
+ url = '';
+
+ if ( val ) {
+ url += '?search=' + val;
+ }
+ this.gridRouter.navigate( this.gridRouter.baseUrl( url ) );
+ }, 1000 );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Update the URL when entering search string (at most once per second)
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $( '#media-search-input' ).on( 'input', _.debounce( function(e) {
- var val = $( e.currentTarget ).val(), url = '';
- if ( val ) {
- url += '?search=' + val;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ search.on( 'input', _.bind( input, this ) );
+ searchView.val( currentSearch ).trigger( 'input' );
+
+ this.gridRouter.on( 'route:search', function () {
+ var href = window.location.href;
+ if ( href.indexOf( 'mode=' ) > -1 ) {
+ href = href.replace( /mode=[^&]+/g, 'mode=list' );
+ } else {
+ href += href.indexOf( '?' ) > -1 ? '&mode=list' : '?mode=list';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- self.gridRouter.navigate( self.gridRouter.baseUrl( url ) );
- }, 1000 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ href = href.replace( 'search=', 's=' );
+ listMode.prop( 'href', href );
+ } );
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre>
</div>
</div>
</body>
</html>