<!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>[22157] trunk/wp-includes: When editing a gallery, images can now be added from the media library.</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/22157">22157</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2012-10-10 09:30:22 +0000 (Wed, 10 Oct 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>When editing a gallery, images can now be added from the media library.
Enables the "Add images from media library" button when editing. The UX has room for improvement, but it's a start.
see <a href="http://core.trac.wordpress.org/ticket/21390">#21390</a>, <a href="http://core.trac.wordpress.org/ticket/21809">#21809</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesjsmediaviewsjs">trunk/wp-includes/js/media-views.js</a></li>
<li><a href="#trunkwpincludesmediaphp">trunk/wp-includes/media.php</a></li>
<li><a href="#trunkwpincludesscriptloaderphp">trunk/wp-includes/script-loader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/media-views.js (22156 => 22157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/media-views.js 2012-10-10 08:47:15 UTC (rev 22156)
+++ trunk/wp-includes/js/media-views.js 2012-10-10 09:30:22 UTC (rev 22157)
</span><span class="lines">@@ -42,11 +42,16 @@
</span><span class="cx"> // then unset the property.
</span><span class="cx"> this.add( 'library', media.view.Workspace.Library, {
</span><span class="cx"> collection: media.query( this.get('library') )
</span><del>- } );
</del><ins>+ });
</ins><span class="cx"> this.unset('library');
</span><span class="cx">
</span><span class="cx"> // Add the gallery view.
</span><del>- this.add( 'gallery', media.view.Workspace.Gallery, { collection: this.selection } );
</del><ins>+ this.add( 'gallery', media.view.Workspace.Gallery, {
+ collection: this.selection
+ });
+ this.add( 'gallery-library', media.view.Workspace.Library.Gallery, {
+ collection: media.query({ type: 'image' })
+ });
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -719,6 +724,38 @@
</span><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><ins>+ media.view.Workspace.Library.Gallery = media.view.Workspace.Library.extend({
+ initToolbarView: function() {
+ var controller = this.controller,
+ editing = controller.get('editing'),
+ items = {
+ 'selection-preview': new media.view.SelectionPreview({
+ controller: this.controller,
+ collection: this.controller.selection,
+ priority: -40,
+ clearable: false
+ }),
+
+ 'continue-editing-gallery': {
+ style: 'primary',
+ text: l10n.continueEditingGallery,
+ priority: 40,
+
+ click: function() {
+ controller.render( 'gallery' );
+ }
+ }
+ };
+
+ this.toolbarView = new media.view.Toolbar({
+ items: items
+ });
+
+ this.$el.addClass('with-toolbar');
+ this.$content.append( this.toolbarView.$el );
+ }
+ });
+
</ins><span class="cx"> /**
</span><span class="cx"> * wp.media.view.Workspace.Gallery
</span><span class="cx"> */
</span><span class="lines">@@ -750,22 +787,15 @@
</span><span class="cx"> click: _.bind( controller.update, controller, 'gallery' )
</span><span class="cx"> },
</span><span class="cx">
</span><del>- 'add-images-from-library': {
- text: l10n.addImagesFromLibrary,
- priority: 30
- }
- };
</del><ins>+ 'return-to-library': {
+ text: editing ? l10n.addImagesFromLibrary : l10n.returnToLibrary,
+ priority: -40,
</ins><span class="cx">
</span><del>- if ( ! editing ) {
- items['return-to-library'] = {
- text: l10n.returnToLibrary,
- priority: -40,
-
- click: function() {
- controller.render('library');
</del><ins>+ click: function() {
+ controller.render( editing ? 'gallery-library' : 'library' );
+ }
</ins><span class="cx"> }
</span><span class="cx"> };
</span><del>- }
</del><span class="cx">
</span><span class="cx"> this.toolbarView = new media.view.Toolbar({
</span><span class="cx"> items: items
</span><span class="lines">@@ -948,13 +978,17 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> initialize: function() {
</span><ins>+ _.defaults( this.options, {
+ clearable: true
+ });
+
</ins><span class="cx"> this.controller = this.options.controller;
</span><span class="cx"> this.collection.on( 'add change:url remove', this.render, this );
</span><span class="cx"> this.render();
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> render: function() {
</span><del>- var options = {},
</del><ins>+ var options = _.clone( this.options ),
</ins><span class="cx"> first, sizes, amount;
</span><span class="cx">
</span><span class="cx"> // If nothing is selected, display nothing.
</span></span></pre></div>
<a id="trunkwpincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/media.php (22156 => 22157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/media.php 2012-10-10 08:47:15 UTC (rev 22156)
+++ trunk/wp-includes/media.php 2012-10-10 09:30:22 UTC (rev 22157)
</span><span class="lines">@@ -1358,7 +1358,9 @@
</span><span class="cx">
</span><span class="cx"> <span class="count"><%- count %></span>
</span><span class="cx"> </div>
</span><del>- <a class="clear-selection" href="#"><?php _e('Clear selection'); ?></a>
</del><ins>+ <% if ( clearable ) { %>
+ <a class="clear-selection" href="#"><?php _e('Clear selection'); ?></a>
+ <% } %>
</ins><span class="cx"> </script>
</span><span class="cx">
</span><span class="cx"> <script type="text/html" id="tmpl-editor-attachment">
</span></span></pre></div>
<a id="trunkwpincludesscriptloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/script-loader.php (22156 => 22157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/script-loader.php 2012-10-10 08:47:15 UTC (rev 22156)
+++ trunk/wp-includes/script-loader.php 2012-10-10 09:30:22 UTC (rev 22157)
</span><span class="lines">@@ -328,10 +328,11 @@
</span><span class="cx"> 'addToGallery' => __( 'Add to gallery' ),
</span><span class="cx">
</span><span class="cx"> // Gallery
</span><del>- 'returnToLibrary' => __( 'Return to media library' ),
- 'insertGalleryIntoPost' => __( 'Insert gallery into post' ),
- 'updateGallery' => __( 'Update gallery' ),
- 'addImagesFromLibrary' => __( 'Add images from media library' ),
</del><ins>+ 'returnToLibrary' => __( 'Return to media library' ),
+ 'continueEditingGallery' => __( 'Continue editing gallery' ),
+ 'insertGalleryIntoPost' => __( 'Insert gallery into post' ),
+ 'updateGallery' => __( 'Update gallery' ),
+ 'addImagesFromLibrary' => __( 'Add images from media library' ),
</ins><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> $scripts->add( 'shortcode', "/wp-includes/js/shortcode$suffix.js", array( 'underscore' ), false, 1 );
</span></span></pre>
</div>
</div>
</body>
</html>