<!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>[22155] trunk: Gallery editing in the media 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, #logmsg > ol { margin-left: 0; 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/22155">22155</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2012-10-10 08:31:12 +0000 (Wed, 10 Oct 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Gallery editing in the media modal.
The edit button on gallery MCE views will open a new instance of the media modal. Images can be removed, uploaded, and reordered. However, the "Add images from media library" button is not yet functional.
see <a href="http://core.trac.wordpress.org/ticket/21390">#21390</a>, <a href="http://core.trac.wordpress.org/ticket/21809">#21809</a>, <a href="http://core.trac.wordpress.org/ticket/21815">#21815</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminjsmediauploadjs">trunk/wp-admin/js/media-upload.js</a></li>
<li><a href="#trunkwpincludesjsmceviewjs">trunk/wp-includes/js/mce-view.js</a></li>
<li><a href="#trunkwpincludesjsmediaviewsjs">trunk/wp-includes/js/media-views.js</a></li>
<li><a href="#trunkwpincludesscriptloaderphp">trunk/wp-includes/script-loader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminjsmediauploadjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/media-upload.js (22154 => 22155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/media-upload.js 2012-10-10 06:47:22 UTC (rev 22154)
+++ trunk/wp-admin/js/media-upload.js 2012-10-10 08:31:12 UTC (rev 22155)
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> // WordPress, TinyMCE, and Media
</span><span class="cx"> // -----------------------------
</span><span class="cx"> (function($){
</span><del>- // Stores the editors' `wp.media.controller.Workflow` instaces.
</del><ins>+ // Stores the editors' `wp.media.controller.Workflow` instances.
</ins><span class="cx"> var workflows = {};
</span><span class="cx">
</span><span class="cx"> wp.mce.media = {
</span></span></pre></div>
<a id="trunkwpincludesjsmceviewjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/mce-view.js (22154 => 22155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/mce-view.js 2012-10-10 06:47:22 UTC (rev 22154)
+++ trunk/wp-includes/js/mce-view.js 2012-10-10 08:31:12 UTC (rev 22155)
</span><span class="lines">@@ -546,7 +546,8 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> shortcode: function( attachments ) {
</span><del>- var attrs = _.pick( attachments.props.toJSON(), 'include', 'exclude', 'orderby', 'order' ),
</del><ins>+ var props = attachments.props.toJSON(),
+ attrs = _.pick( props, 'include', 'exclude', 'orderby', 'order' ),
</ins><span class="cx"> shortcode;
</span><span class="cx">
</span><span class="cx"> attrs.ids = attachments.pluck('id');
</span><span class="lines">@@ -557,7 +558,11 @@
</span><span class="cx"> type: 'single'
</span><span class="cx"> });
</span><span class="cx">
</span><del>- galleries[ shortcode.string() ] = attachments;
</del><ins>+ // Use a cloned version of the gallery.
+ galleries[ shortcode.string() ] = new wp.media.model.Attachments( attachments.models, {
+ props: props
+ });
+
</ins><span class="cx"> return shortcode;
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="lines">@@ -574,14 +579,18 @@
</span><span class="cx"> parent: $('#post_ID').val(),
</span><span class="cx">
</span><span class="cx"> events: {
</span><del>- 'click .close': 'remove'
</del><ins>+ 'click .close': 'remove',
+ 'click .edit': 'edit'
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> initialize: function() {
</span><del>- var view = mceview.get('gallery'),
- shortcode = this.options.shortcode;
</del><ins>+ this.update();
+ },
</ins><span class="cx">
</span><del>- this.attachments = view.gallery.attachments( shortcode, this.parent );
</del><ins>+ update: function() {
+ var view = mceview.get('gallery');
+
+ this.attachments = view.gallery.attachments( this.options.shortcode, this.parent );
</ins><span class="cx"> this.attachments.more().done( _.bind( this.render, this ) );
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -601,6 +610,34 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> this.$el.html( this.template( options ) );
</span><ins>+ },
+
+ edit: function() {
+ if ( ! wp.media.view || this.workflow )
+ return;
+
+ this.workflow = wp.media({
+ view: 'gallery',
+ selection: this.attachments.models,
+ title: mceview.l10n.editGallery,
+ editing: true,
+ multiple: true
+ });
+
+ // Create a single-use workflow. If the workflow is closed,
+ // then detach it from the DOM and remove the reference.
+ this.workflow.on( 'close', function() {
+ this.workflow.detach();
+ delete this.workflow;
+ }, this );
+
+ // Update the `shortcode` and `attachments`.
+ this.workflow.on( 'update:gallery', function( selection ) {
+ var view = mceview.get('gallery');
+
+ this.options.shortcode = view.gallery.shortcode( selection );
+ this.update();
+ }, this );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunkwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/media-views.js (22154 => 22155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/media-views.js 2012-10-10 06:47:22 UTC (rev 22154)
+++ trunk/wp-includes/js/media-views.js 2012-10-10 08:31:12 UTC (rev 22155)
</span><span class="lines">@@ -119,8 +119,8 @@
</span><span class="cx">
</span><span class="cx"> update: function( event ) {
</span><span class="cx"> this.close();
</span><del>- this.trigger( 'update', this.selection );
- this.trigger( 'update:' + event, this.selection );
</del><ins>+ this.trigger( 'update', this.selection, this );
+ this.trigger( 'update:' + event, this.selection, this );
</ins><span class="cx"> this.selection.clear();
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -217,18 +217,22 @@
</span><span class="cx">
</span><span class="cx"> attach: function() {
</span><span class="cx"> this.$el.appendTo( this.options.container );
</span><ins>+ this.controller.trigger( 'attach', this.controller );
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> detach: function() {
</span><span class="cx"> this.$el.detach();
</span><ins>+ this.controller.trigger( 'detach', this.controller );
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> open: function() {
</span><span class="cx"> this.$el.show();
</span><ins>+ this.controller.trigger( 'open', this.controller );
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> close: function() {
</span><span class="cx"> this.$el.hide();
</span><ins>+ this.controller.trigger( 'close', this.controller );
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> closeHandler: function( event ) {
</span><span class="lines">@@ -277,8 +281,8 @@
</span><span class="cx"> // Make sure to detach the elements we want to reuse.
</span><span class="cx"> // Otherwise, `jQuery.html()` will unbind their events.
</span><span class="cx"> $( _.pluck( this._views, 'el' ) ).detach();
</span><del>- this.$primary.html( _.pluck( views.primary, 'el' ) );
- this.$secondary.html( _.pluck( views.secondary, 'el' ) );
</del><ins>+ this.$primary.html( _.pluck( views.primary || [], 'el' ) );
+ this.$secondary.html( _.pluck( views.secondary || [], 'el' ) );
</ins><span class="cx">
</span><span class="cx"> return this;
</span><span class="cx"> },
</span><span class="lines">@@ -736,22 +740,12 @@
</span><span class="cx"> // appropriate workflow when the time comes, but is currently here
</span><span class="cx"> // to test multiple selections.
</span><span class="cx"> initToolbarView: function() {
</span><del>- var controller = this.controller;
-
- this.toolbarView = new media.view.Toolbar({
- items: {
- 'return-to-library': {
- text: l10n.returnToLibrary,
- priority: -40,
-
- click: function() {
- controller.render('library');
- }
- },
-
- 'insert-gallery-into-post': {
</del><ins>+ var controller = this.controller,
+ editing = controller.get('editing'),
+ items = {
+ 'update-gallery': {
</ins><span class="cx"> style: 'primary',
</span><del>- text: l10n.insertGalleryIntoPost,
</del><ins>+ text: editing ? l10n.updateGallery : l10n.insertGalleryIntoPost,
</ins><span class="cx"> priority: 40,
</span><span class="cx"> click: _.bind( controller.update, controller, 'gallery' )
</span><span class="cx"> },
</span><span class="lines">@@ -760,7 +754,21 @@
</span><span class="cx"> text: l10n.addImagesFromLibrary,
</span><span class="cx"> priority: 30
</span><span class="cx"> }
</span><del>- }
</del><ins>+ };
+
+ if ( ! editing ) {
+ items['return-to-library'] = {
+ text: l10n.returnToLibrary,
+ priority: -40,
+
+ click: function() {
+ controller.render('library');
+ }
+ };
+ }
+
+ this.toolbarView = new media.view.Toolbar({
+ items: items
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> this.$el.addClass('with-toolbar');
</span></span></pre></div>
<a id="trunkwpincludesscriptloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/script-loader.php (22154 => 22155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/script-loader.php 2012-10-10 06:47:22 UTC (rev 22154)
+++ trunk/wp-includes/script-loader.php 2012-10-10 08:31:12 UTC (rev 22155)
</span><span class="lines">@@ -330,6 +330,7 @@
</span><span class="cx"> // Gallery
</span><span class="cx"> 'returnToLibrary' => __( 'Return to media library' ),
</span><span class="cx"> 'insertGalleryIntoPost' => __( 'Insert gallery into post' ),
</span><ins>+ 'updateGallery' => __( 'Update gallery' ),
</ins><span class="cx"> 'addImagesFromLibrary' => __( 'Add images from media library' ),
</span><span class="cx"> ) );
</span><span class="cx">
</span><span class="lines">@@ -337,6 +338,7 @@
</span><span class="cx"> $scripts->add( 'mce-view', "/wp-includes/js/mce-view$suffix.js", array( 'shortcode', 'media-models' ), false, 1 );
</span><span class="cx"> did_action( 'init' ) && $scripts->localize( 'mce-view', '_wpMceViewL10n', array(
</span><span class="cx"> 'contentWidth' => isset( $GLOBALS['content_width'] ) ? $GLOBALS['content_width'] : 800,
</span><ins>+ 'editGallery' => __( 'Edit Gallery' ),
</ins><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> if ( is_admin() ) {
</span></span></pre>
</div>
</div>
</body>
</html>