<!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>[41021] trunk/src/wp-includes/js: Media: library grid view - improve browser history support.</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/41021">41021</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/41021","name":"Review Commit"}}</script></dd>

<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>adamsilverstein</dd>

<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-07-10 19:07:27 +0000 (Mon, 10 Jul 2017)</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'>Media: library grid view - improve browser history support.

Set view state properly when navigating history using the browser back/next button in the media library (grid view). Correctly handle navigating, search, image detail view and image edit mode. Also handle bookmarking/reloading.

Props kucrut, joemcgill, afercia.

Fixes <a href="https://core.trac.wordpress.org/ticket/31846">#31846</a>.</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#trunksrcwpincludesjsmediaroutersmanagejs">trunk/src/wp-includes/js/media/routers/manage.js</a></li>

<li><a href="#trunksrcwpincludesjsmediaviewsattachmentdetailstwocolumnjs">trunk/src/wp-includes/js/media/views/attachment/details-two-column.js</a></li>

<li><a href="#trunksrcwpincludesjsmediaviewsframeeditattachmentsjs">trunk/src/wp-includes/js/media/views/frame/edit-attachments.js</a></li>

<li><a href="#trunksrcwpincludesjsmediaviewsframemanagejs">trunk/src/wp-includes/js/media/views/frame/manage.js</a></li>

<li><a href="#trunksrcwpincludesjsmediagridjs">trunk/src/wp-includes/js/media-grid.js</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunksrcwpincludesjsmediaroutersmanagejs"></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/routers/manage.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/routers/manage.js  2017-07-10 18:39:56 UTC (rev 41020)

+++ trunk/src/wp-includes/js/media/routers/manage.js    2017-07-10 19:07:27 UTC (rev 41021)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,8 +8,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> var Router = Backbone.Router.extend({

</span><span class="cx" style="display: block; padding: 0 10px">        routes: {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                'upload.php?item=:slug':    'showItem',

-               'upload.php?search=:query': 'search'

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         'upload.php?item=:slug&mode=edit': 'editItem',

+               'upload.php?item=:slug':           'showItem',

+               'upload.php?search=:query':        'search',

+               'upload.php':                      'reset'

</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">        // Map routes against the page URL

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,6 +19,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">                return 'upload.php' + url;

</span><span class="cx" style="display: block; padding: 0 10px">        },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        reset: function() {

+               var frame = wp.media.frames.edit;

+

+               if ( frame ) {

+                       frame.close();

+               }

+       },

+

</ins><span class="cx" style="display: block; padding: 0 10px">         // Respond to the search route by filling the search field and trigggering the input event

</span><span class="cx" style="display: block; padding: 0 10px">        search: function( query ) {

</span><span class="cx" style="display: block; padding: 0 10px">                jQuery( '#media-search-input' ).val( query ).trigger( 'input' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,21 +35,30 @@

</span><span class="cx" style="display: block; padding: 0 10px">        // Show the modal with a specific item

</span><span class="cx" style="display: block; padding: 0 10px">        showItem: function( query ) {

</span><span class="cx" style="display: block; padding: 0 10px">                var media = wp.media,

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        library = media.frame.state().get('library'),

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 frame = media.frames.browse,

+                       library = frame.state().get('library'),

</ins><span class="cx" style="display: block; padding: 0 10px">                         item;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                // Trigger the media frame to open the correct item

</span><span class="cx" style="display: block; padding: 0 10px">                item = library.findWhere( { id: parseInt( query, 10 ) } );

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                item.set( 'skipHistory', true );

+

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( item ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        media.frame.trigger( 'edit:attachment', item );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 frame.trigger( 'edit:attachment', item );

</ins><span class="cx" style="display: block; padding: 0 10px">                 } else {

</span><span class="cx" style="display: block; padding: 0 10px">                        item = media.attachment( query );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        media.frame.listenTo( item, 'change', function( model ) {

-                               media.frame.stopListening( item );

-                               media.frame.trigger( 'edit:attachment', model );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 frame.listenTo( item, 'change', function( model ) {

+                               frame.stopListening( item );

+                               frame.trigger( 'edit:attachment', model );

</ins><span class="cx" style="display: block; padding: 0 10px">                         } );

</span><span class="cx" style="display: block; padding: 0 10px">                        item.fetch();

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        },

+

+       // Show the modal in edit mode with a specific item.

+       editItem: function( query ) {

+               this.showItem( query );

+               wp.media.frames.edit.content.mode( 'edit-details' );

</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="trunksrcwpincludesjsmediaviewsattachmentdetailstwocolumnjs"></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/attachment/details-two-column.js</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/attachment/details-two-column.js     2017-07-10 18:39:56 UTC (rev 41020)

+++ trunk/src/wp-includes/js/media/views/attachment/details-two-column.js       2017-07-10 19:07:27 UTC (rev 41021)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,8 +17,16 @@

</span><span class="cx" style="display: block; padding: 0 10px"> TwoColumn = Details.extend({

</span><span class="cx" style="display: block; padding: 0 10px">        template: wp.template( 'attachment-details-two-column' ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        initialize: function() {

+               this.controller.on( 'content:activate:edit-details', _.bind( this.editAttachment, this ) );

+

+               Details.prototype.initialize.apply( this, arguments );

+       },

+

</ins><span class="cx" style="display: block; padding: 0 10px">         editAttachment: function( event ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                event.preventDefault();

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( event ) {

+                       event.preventDefault();

+               }

</ins><span class="cx" style="display: block; padding: 0 10px">                 this.controller.content.mode( 'edit-image' );

</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="trunksrcwpincludesjsmediaviewsframeeditattachmentsjs"></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/edit-attachments.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/edit-attachments.js    2017-07-10 18:39:56 UTC (rev 41020)

+++ trunk/src/wp-includes/js/media/views/frame/edit-attachments.js      2017-07-10 19:07:27 UTC (rev 41021)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -59,15 +59,21 @@

<span class="cx" style="display: block; padding: 0 10px">                // Bind default title creation.

</span><span class="cx" style="display: block; padding: 0 10px">                this.on( 'title:create:default', this.createTitle, this );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Close the modal if the attachment is deleted.

-               this.listenTo( this.model, 'change:status destroy', this.close, this );

-

</del><span class="cx" style="display: block; padding: 0 10px">                 this.on( 'content:create:edit-metadata', this.editMetadataMode, this );

</span><span class="cx" style="display: block; padding: 0 10px">                this.on( 'content:create:edit-image', this.editImageMode, this );

</span><span class="cx" style="display: block; padding: 0 10px">                this.on( 'content:render:edit-image', this.editImageModeRender, this );

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                this.on( 'refresh', this.rerender, this );

</ins><span class="cx" style="display: block; padding: 0 10px">                 this.on( 'close', this.detach );

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

+               this.bindModelHandlers();

+               this.listenTo( this.gridRouter, 'route:search', this.close, this );

</ins><span class="cx" style="display: block; padding: 0 10px">         },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        bindModelHandlers: function() {

+               // Close the modal if the attachment is deleted.

+               this.listenTo( this.model, 'change:status destroy', this.close, this );

+       },

+

</ins><span class="cx" style="display: block; padding: 0 10px">         createModal: function() {

<span class="cx" style="display: block; padding: 0 10px">                // Initialize modal container view.

</span><span class="cx" style="display: block; padding: 0 10px">                if ( this.options.modal ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -82,7 +88,6 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                        // Completely destroy the modal DOM element when closing it.

</span><span class="cx" style="display: block; padding: 0 10px">                        this.modal.on( 'close', _.bind( function() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                this.modal.remove();

</del><span class="cx" style="display: block; padding: 0 10px">                                 $( 'body' ).off( 'keydown.media-modal' ); /* remove the keydown event */

</span><span class="cx" style="display: block; padding: 0 10px">                                // Restore the original focus item if possible

</span><span class="cx" style="display: block; padding: 0 10px">                                $( 'li.attachment[data-id="' + this.model.get( 'id' ) +'"]' ).focus();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -100,7 +105,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        createStates: function() {

</span><span class="cx" style="display: block; padding: 0 10px">                this.states.add([

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        new wp.media.controller.EditAttachmentMetadata( { model: this.model } )

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 new wp.media.controller.EditAttachmentMetadata({

+                               model:   this.model,

+                               library: this.library

+                       })

</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -125,8 +133,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        model:      this.model

</span><span class="cx" style="display: block; padding: 0 10px">                }) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Update browser url when navigating media details

-               if ( this.model ) {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Update browser url when navigating media details, except on load.

+               if ( this.model && ! this.model.get( 'skipHistory' ) ) {

</ins><span class="cx" style="display: block; padding: 0 10px">                         this.gridRouter.navigate( this.gridRouter.baseUrl( '?item=' + this.model.id ) );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">        },

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -152,6 +160,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        frame: this,

</span><span class="cx" style="display: block; padding: 0 10px">                        controller: editImageController

</span><span class="cx" style="display: block; padding: 0 10px">                } );

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

+               this.gridRouter.navigate( this.gridRouter.baseUrl( '?item=' + this.model.id + '&mode=edit' ) );

+

</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">        editImageModeRender: function( view ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -166,7 +177,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<span class="cx" style="display: block; padding: 0 10px">         * Rerender the view.

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        rerender: function() {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ rerender: function( model ) {

+               this.stopListening( this.model );

+

+               this.model = model;

+

+               this.bindModelHandlers();

+

</ins><span class="cx" style="display: block; padding: 0 10px">                 // Only rerender the `content` region.

</span><span class="cx" style="display: block; padding: 0 10px">                if ( this.content.mode() !== 'edit-metadata' ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        this.content.mode( 'edit-metadata' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -185,8 +202,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        this.$( '.left' ).blur();

</span><span class="cx" style="display: block; padding: 0 10px">                        return;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                this.model = this.library.at( this.getCurrentIndex() - 1 );

-               this.rerender();

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.trigger( 'refresh', this.library.at( this.getCurrentIndex() - 1 ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 this.$( '.left' ).focus();

</span><span class="cx" style="display: block; padding: 0 10px">        },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -198,8 +214,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        this.$( '.right' ).blur();

</span><span class="cx" style="display: block; padding: 0 10px">                        return;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                this.model = this.library.at( this.getCurrentIndex() + 1 );

-               this.rerender();

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.trigger( 'refresh', this.library.at( this.getCurrentIndex() + 1 ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 this.$( '.right' ).focus();

</span><span class="cx" style="display: block; padding: 0 10px">        },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -234,7 +249,9 @@

</span><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">        resetRoute: function() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                this.gridRouter.navigate( this.gridRouter.baseUrl( '' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         var searchTerm = this.controller.browserView.toolbar.get( 'search' ).$el.val(),

+                       url = '' !== searchTerm ? '?search=' + searchTerm : '';

+               this.gridRouter.navigate( this.gridRouter.baseUrl( url ), { replace: true } );

</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      2017-07-10 18:39:56 UTC (rev 41020)

+++ trunk/src/wp-includes/js/media/views/frame/manage.js        2017-07-10 19:07:27 UTC (rev 41021)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -81,38 +81,42 @@

</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><span class="cx" style="display: block; padding: 0 10px">                this.bindSearchHandler();

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

+               wp.media.frames.browse = this;

</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">        bindSearchHandler: function() {

</span><span class="cx" style="display: block; padding: 0 10px">                var search = this.$( '#media-search-input' ),

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        currentSearch = this.options.container.data( 'search' ),

</del><span class="cx" style="display: block; padding: 0 10px">                         searchView = this.browserView.toolbar.get( 'search' ).$el,

</span><span class="cx" style="display: block; padding: 0 10px">                        listMode = this.$( '.view-list' ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        input  = _.debounce( function (e) {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 input  = _.throttle( function (e) {

</ins><span class="cx" style="display: block; padding: 0 10px">                                 var val = $( e.currentTarget ).val(),

</span><span class="cx" style="display: block; padding: 0 10px">                                        url = '';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( val ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                        url += '?search=' + val;

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                        this.gridRouter.navigate( this.gridRouter.baseUrl( url ), { replace: true } );

</ins><span class="cx" style="display: block; padding: 0 10px">                                 }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                this.gridRouter.navigate( this.gridRouter.baseUrl( url ) );

</del><span class="cx" style="display: block; padding: 0 10px">                         }, 1000 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                // Update the URL when entering search string (at most once per second)

</span><span class="cx" style="display: block; padding: 0 10px">                search.on( 'input', _.bind( input, this ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                searchView.val( currentSearch ).trigger( 'input' );

</del><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                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';

-                       }

-                       href = href.replace( 'search=', 's=' );

-                       listMode.prop( 'href', href );

-               } );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         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';

+                               }

+                               href = href.replace( 'search=', 's=' );

+                               listMode.prop( 'href', href );

+                       })

+                       .on( 'route:reset', function() {

+                               searchView.val( '' ).trigger( 'input' );

+                       });

</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -204,12 +208,16 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        openEditAttachmentModal: function( model ) {

<span class="cx" style="display: block; padding: 0 10px">                // Create a new EditAttachment frame, passing along the library and the attachment model.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                wp.media( {

-                       frame:       'edit-attachments',

-                       controller:  this,

-                       library:     this.state().get('library'),

-                       model:       model

-               } );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( wp.media.frames.edit ) {

+                       wp.media.frames.edit.open().trigger( 'refresh', model );

+               } else {

+                       wp.media.frames.edit = wp.media( {

+                               frame:       'edit-attachments',

+                               controller:  this,

+                               library:     this.state().get('library'),

+                               model:       model

+                       } );

+               }

</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="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    2017-07-10 18:39:56 UTC (rev 41020)

+++ trunk/src/wp-includes/js/media-grid.js      2017-07-10 19:07:27 UTC (rev 41021)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -50,8 +50,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> var Router = Backbone.Router.extend({

</span><span class="cx" style="display: block; padding: 0 10px">        routes: {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                'upload.php?item=:slug':    'showItem',

-               'upload.php?search=:query': 'search'

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         'upload.php?item=:slug&mode=edit': 'editItem',

+               'upload.php?item=:slug':           'showItem',

+               'upload.php?search=:query':        'search',

+               'upload.php':                      'reset'

</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">        // Map routes against the page URL

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -59,6 +61,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">                return 'upload.php' + url;

</span><span class="cx" style="display: block; padding: 0 10px">        },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        reset: function() {

+               var frame = wp.media.frames.edit;

+

+               if ( frame ) {

+                       frame.close();

+               }

+       },

+

</ins><span class="cx" style="display: block; padding: 0 10px">         // Respond to the search route by filling the search field and trigggering the input event

</span><span class="cx" style="display: block; padding: 0 10px">        search: function( query ) {

</span><span class="cx" style="display: block; padding: 0 10px">                jQuery( '#media-search-input' ).val( query ).trigger( 'input' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -67,21 +77,30 @@

</span><span class="cx" style="display: block; padding: 0 10px">        // Show the modal with a specific item

</span><span class="cx" style="display: block; padding: 0 10px">        showItem: function( query ) {

</span><span class="cx" style="display: block; padding: 0 10px">                var media = wp.media,

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        library = media.frame.state().get('library'),

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 frame = media.frames.browse,

+                       library = frame.state().get('library'),

</ins><span class="cx" style="display: block; padding: 0 10px">                         item;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                // Trigger the media frame to open the correct item

</span><span class="cx" style="display: block; padding: 0 10px">                item = library.findWhere( { id: parseInt( query, 10 ) } );

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                item.set( 'skipHistory', true );

+

</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( item ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        media.frame.trigger( 'edit:attachment', item );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 frame.trigger( 'edit:attachment', item );

</ins><span class="cx" style="display: block; padding: 0 10px">                 } else {

</span><span class="cx" style="display: block; padding: 0 10px">                        item = media.attachment( query );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        media.frame.listenTo( item, 'change', function( model ) {

-                               media.frame.stopListening( item );

-                               media.frame.trigger( 'edit:attachment', model );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 frame.listenTo( item, 'change', function( model ) {

+                               frame.stopListening( item );

+                               frame.trigger( 'edit:attachment', model );

</ins><span class="cx" style="display: block; padding: 0 10px">                         } );

</span><span class="cx" style="display: block; padding: 0 10px">                        item.fetch();

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        },

+

+       // Show the modal in edit mode with a specific item.

+       editItem: function( query ) {

+               this.showItem( query );

+               wp.media.frames.edit.content.mode( 'edit-details' );

</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -107,8 +126,16 @@

</span><span class="cx" style="display: block; padding: 0 10px"> TwoColumn = Details.extend({

</span><span class="cx" style="display: block; padding: 0 10px">        template: wp.template( 'attachment-details-two-column' ),

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        initialize: function() {

+               this.controller.on( 'content:activate:edit-details', _.bind( this.editAttachment, this ) );

+

+               Details.prototype.initialize.apply( this, arguments );

+       },

+

</ins><span class="cx" style="display: block; padding: 0 10px">         editAttachment: function( event ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                event.preventDefault();

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( event ) {

+                       event.preventDefault();

+               }

</ins><span class="cx" style="display: block; padding: 0 10px">                 this.controller.content.mode( 'edit-image' );

</span><span class="cx" style="display: block; padding: 0 10px">        },

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -401,15 +428,21 @@