<!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>[29076] trunk/src/wp-includes/js: Media Grid: decouple the Grid and Edit modal frames.</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/29076">29076</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-07-10 19:38:56 +0000 (Thu, 10 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Media Grid: decouple the Grid and Edit modal frames. Next steps: we shouldn't have to reload the frame while paginating.
See <a href="http://core.trac.wordpress.org/ticket/24716">#24716</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesjsmediagridjs">trunk/src/wp-includes/js/media-grid.js</a></li>
<li><a href="#trunksrcwpincludesjsmediamodelsjs">trunk/src/wp-includes/js/media-models.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 (29075 => 29076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/media-grid.js 2014-07-10 19:35:32 UTC (rev 29075)
+++ trunk/src/wp-includes/js/media-grid.js 2014-07-10 19:38:56 UTC (rev 29076)
</span><span class="lines">@@ -216,26 +216,12 @@
</span><span class="cx">
</span><span class="cx"> // Handle a frame-level event for editing an attachment.
</span><span class="cx"> this.on( 'edit:attachment', this.editAttachment, this );
</span><del>- this.on( 'edit:attachment:next', this.editNextAttachment, this );
- this.on( 'edit:attachment:previous', this.editPreviousAttachment, this );
</del><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> addNewClickHandler: function() {
</span><span class="cx"> this.trigger( 'show:upload:attachment' );
</span><span class="cx"> },
</span><span class="cx">
</span><del>- editPreviousAttachment: function( currentModel ) {
- var library = this.state().get('library'),
- currentModelIndex = library.indexOf( currentModel );
- this.trigger( 'edit:attachment', library.at( currentModelIndex - 1 ) );
- },
-
- editNextAttachment: function( currentModel ) {
- var library = this.state().get('library'),
- currentModelIndex = library.indexOf( currentModel );
- this.trigger( 'edit:attachment', library.at( currentModelIndex + 1 ) );
- },
-
</del><span class="cx"> /**
</span><span class="cx"> * Open the Edit Attachment modal.
</span><span class="cx"> */
</span><span class="lines">@@ -244,15 +230,13 @@
</span><span class="cx"> library = this.state().get('library');
</span><span class="cx">
</span><span class="cx"> // Create a new EditAttachment frame, passing along the library and the attachment model.
</span><del>- this.editAttachmentFrame = new media.view.Frame.EditAttachments({
</del><ins>+ this.editAttachmentFrame = wp.media( {
+ frame: 'edit-attachments',
</ins><span class="cx"> gridRouter: this.gridRouter,
</span><span class="cx"> library: library,
</span><span class="cx"> model: model
</span><del>- });
</del><ins>+ } );
</ins><span class="cx">
</span><del>- // Listen to events on the edit attachment frame for triggering pagination callback handlers.
- this.listenTo( this.editAttachmentFrame, 'edit:attachment:next', this.editNextAttachment );
- this.listenTo( this.editAttachmentFrame, 'edit:attachment:previous', this.editPreviousAttachment );
</del><span class="cx"> // Listen to keyboard events on the modal
</span><span class="cx"> $( 'body' ).on( 'keydown.media-modal', function( e ) {
</span><span class="cx"> self.editAttachmentFrame.keyEvent( e );
</span><span class="lines">@@ -385,7 +369,7 @@
</span><span class="cx"> *
</span><span class="cx"> * Requires an attachment model to be passed in the options hash under `model`.
</span><span class="cx"> */
</span><del>- media.view.Frame.EditAttachments = media.view.Frame.extend({
</del><ins>+ media.view.MediaFrame.EditAttachments = media.view.Frame.extend({
</ins><span class="cx">
</span><span class="cx"> className: 'edit-attachment-frame',
</span><span class="cx"> template: media.template( 'edit-attachment-frame' ),
</span><span class="lines">@@ -535,6 +519,16 @@
</span><span class="cx"> });
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ resetContent: function() {
+ this.modal.close();
+ wp.media( {
+ frame: 'edit-attachments',
+ gridRouter: this.gridRouter,
+ library: this.library,
+ model: this.model
+ } );
+ },
+
</ins><span class="cx"> /**
</span><span class="cx"> * Click handler to switch to the previous media item.
</span><span class="cx"> */
</span><span class="lines">@@ -542,8 +536,8 @@
</span><span class="cx"> if ( ! this.hasPrevious() ) {
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- this.modal.close();
- this.trigger( 'edit:attachment:previous', this.model );
</del><ins>+ this.model = this.library.at( this.getCurrentIndex() - 1 );
+ this.resetContent();
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -553,8 +547,8 @@
</span><span class="cx"> if ( ! this.hasNext() ) {
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- this.modal.close();
- this.trigger( 'edit:attachment:next', this.model );
</del><ins>+ this.model = this.library.at( this.getCurrentIndex() + 1 );
+ this.resetContent();
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> getCurrentIndex: function() {
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediamodelsjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/media-models.js (29075 => 29076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/media-models.js 2014-07-10 19:35:32 UTC (rev 29075)
+++ trunk/src/wp-includes/js/media-models.js 2014-07-10 19:38:56 UTC (rev 29076)
</span><span class="lines">@@ -38,6 +38,8 @@
</span><span class="cx"> frame = new MediaFrame.AudioDetails( attributes );
</span><span class="cx"> } else if ( 'video' === attributes.frame && MediaFrame.VideoDetails ) {
</span><span class="cx"> frame = new MediaFrame.VideoDetails( attributes );
</span><ins>+ } else if ( 'edit-attachments' === attributes.frame && MediaFrame.EditAttachments ) {
+ frame = new MediaFrame.EditAttachments( attributes );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> delete attributes.frame;
</span></span></pre>
</div>
</div>
</body>
</html>