<!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>[29282] trunk/src/wp-includes/js: Media Grid: Manage focus when toggling between the grid and an edit attachment modal</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/29282">29282</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-07-24 19:04:48 +0000 (Thu, 24 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Media Grid: Manage focus when toggling between the grid and an edit attachment modal
Props adamsilverstein for the initial patch.
Fixes <a href="http://core.trac.wordpress.org/ticket/28857">#28857</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesjsmediagridjs">trunk/src/wp-includes/js/media-grid.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsjs">trunk/src/wp-includes/js/media-views.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesjsmediagridjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/media-grid.js (29281 => 29282)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/media-grid.js 2014-07-24 18:03:58 UTC (rev 29281)
+++ trunk/src/wp-includes/js/media-grid.js 2014-07-24 19:04:48 UTC (rev 29282)
</span><span class="lines">@@ -170,11 +170,12 @@
</span><span class="cx"> /**
</span><span class="cx"> * Open the Edit Attachment modal.
</span><span class="cx"> */
</span><del>- openEditAttachmentModal: function( model ) {
</del><ins>+ openEditAttachmentModal: function( model, currentTarget ) {
</ins><span class="cx"> // Create a new EditAttachment frame, passing along the library and the attachment model.
</span><span class="cx"> wp.media( {
</span><span class="cx"> frame: 'edit-attachments',
</span><span class="cx"> gridRouter: this.gridRouter,
</span><ins>+ gridItem: $( currentTarget ).closest( 'li' ),
</ins><span class="cx"> library: this.state().get('library'),
</span><span class="cx"> model: model
</span><span class="cx"> } );
</span><span class="lines">@@ -367,6 +368,7 @@
</span><span class="cx"> state: 'edit-attachment'
</span><span class="cx"> });
</span><span class="cx">
</span><ins>+ this.gridItem = this.options.gridItem;
</ins><span class="cx"> this.gridRouter = this.options.gridRouter;
</span><span class="cx"> this.library = this.options.library;
</span><span class="cx"> if ( this.options.model ) {
</span><span class="lines">@@ -403,7 +405,8 @@
</span><span class="cx"> this.modal.on( 'close', function() {
</span><span class="cx"> self.modal.remove();
</span><span class="cx"> $( 'body' ).off( 'keydown.media-modal' ); /* remove the keydown event */
</span><del>-
</del><ins>+ // Restore the original focus item if possible
+ self.gridItem && self.gridItem.focus();
</ins><span class="cx"> self.resetRoute();
</span><span class="cx"> } );
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/media-views.js (29281 => 29282)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/media-views.js 2014-07-24 18:03:58 UTC (rev 29281)
+++ trunk/src/wp-includes/js/media-views.js 2014-07-24 19:04:48 UTC (rev 29282)
</span><span class="lines">@@ -4760,7 +4760,8 @@
</span><span class="cx">
</span><span class="cx"> // In the grid view, bubble up an edit:attachment event to the controller.
</span><span class="cx"> if ( this.controller.isModeActive( 'grid' ) ) {
</span><del>- this.controller.trigger( 'edit:attachment', this.model );
</del><ins>+ // Pass the current target to restore focus when closing
+ this.controller.trigger( 'edit:attachment', this.model, event.currentTarget );
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>