<!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>[21906] trunk/wp-includes: The first inklings of a gallery management screen.</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/21906">21906</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2012-09-19 00:34:00 +0000 (Wed, 19 Sep 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>The first inklings of a gallery management screen.
* Adds `view.Workspace.Library` and `view.Workspace.Gallery` as extensions of `view.Workspace` to implement the individual screens
* Shifts the toolbar logic that was library-specific from the generic `Workspace` view to `Workspace.Library`.
* Adds a toolbar to the `Gallery` view.
* 'Create a gallery' and 'Return to media library' buttons toggle between the two views.
* 'Insert gallery into post' closes the modal, but does not actually perform its namesake action.
* Note that elements can still be deselected in the gallery view. This will be fixed in a future commit.
Improvements to avoid over-eager event unbinding:
* `Modal` views now properly detach their contents before replacing them with a new element.
* Likewise, `Workspace` views detach their main content blocks when re-rendering the view.
To test the gallery workflow (which is incomplete), run the following in your browser's console:
`wp.media({ multiple: true });`
see <a href="http://core.trac.wordpress.org/ticket/21809">#21809</a>, <a href="http://core.trac.wordpress.org/ticket/21390">#21390</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludescssmediaviewscss">trunk/wp-includes/css/media-views.css</a></li>
<li><a href="#trunkwpincludesjsmediaviewsjs">trunk/wp-includes/js/media-views.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludescssmediaviewscss"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/css/media-views.css (21905 => 21906)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/css/media-views.css 2012-09-18 23:38:25 UTC (rev 21905)
+++ trunk/wp-includes/css/media-views.css 2012-09-19 00:34:00 UTC (rev 21906)
</span><span class="lines">@@ -178,8 +178,7 @@
</span><span class="cx"> margin-top: 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.media-workspace .media-toolbar .add-to-gallery,
-.media-workspace .media-toolbar .create-new-gallery {
</del><ins>+.media-workspace .media-toolbar .add-to-gallery {
</ins><span class="cx"> display: none;
</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 (21905 => 21906)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/media-views.js 2012-09-18 23:38:25 UTC (rev 21905)
+++ trunk/wp-includes/js/media-views.js 2012-09-19 00:34:00 UTC (rev 21906)
</span><span class="lines">@@ -31,7 +31,8 @@
</span><span class="cx"> this.modal = new media.view.Modal({ controller: this });
</span><span class="cx">
</span><span class="cx"> // Add default views.
</span><del>- this.add( 'library', media.view.Workspace );
</del><ins>+ this.add( 'library', media.view.Workspace.Library, { collection: media.query() } );
+ this.add( 'gallery', media.view.Workspace.Gallery, { collection: this.selection } );
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -212,6 +213,11 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> content: function( $content ) {
</span><ins>+ // Detach any existing content to prevent events from being lost.
+ if ( this.options.$content )
+ this.options.$content.detach();
+
+ // Set and render the content.
</ins><span class="cx"> this.options.$content = ( $content instanceof Backbone.View ) ? $content.$el : $content;
</span><span class="cx"> return this.render();
</span><span class="cx"> },
</span><span class="lines">@@ -293,18 +299,20 @@
</span><span class="cx">
</span><span class="cx"> initialize: function() {
</span><span class="cx"> _.defaults( this.options, {
</span><del>- style: 'secondary',
</del><span class="cx"> text: '',
</span><span class="cx"> classes: []
</span><span class="cx"> });
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> render: function() {
</span><del>- var classes = [ this.className ];
</del><ins>+ var classes = [ 'button', this.className ];
</ins><span class="cx">
</span><span class="cx"> if ( this.options.style )
</span><span class="cx"> classes.push( 'button-' + this.options.style );
</span><span class="cx">
</span><ins>+ if ( this.options.size )
+ classes.push( 'button-' + this.options.size );
+
</ins><span class="cx"> classes = classes.concat( this.options.classes );
</span><span class="cx"> this.el.className = classes.join(' ');
</span><span class="cx"> this.$el.text( this.options.text );
</span><span class="lines">@@ -341,14 +349,10 @@
</span><span class="cx">
</span><span class="cx"> this.$content = $('<div class="existing-attachments" />');
</span><span class="cx">
</span><del>- // If this supports multiple attachments, initialize the sample toolbar view.
- if ( this.controller.get('multiple') )
- this.initToolbarView();
-
</del><span class="cx"> this.attachmentsView = new media.view.Attachments({
</span><span class="cx"> controller: this.controller,
</span><span class="cx"> directions: 'Select stuff.',
</span><del>- collection: media.query()
</del><ins>+ collection: this.collection
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> this.$content.append( this.attachmentsView.$el );
</span><span class="lines">@@ -358,6 +362,8 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> render: function() {
</span><ins>+ this.$content.detach();
+
</ins><span class="cx"> this.attachmentsView.render();
</span><span class="cx"> this.renderUploadProgress();
</span><span class="cx"> this.$el.html( this.template( this.options ) ).append( this.$content );
</span><span class="lines">@@ -393,6 +399,19 @@
</span><span class="cx"> else
</span><span class="cx"> return memo + 100;
</span><span class="cx"> }, 0 ) / queue.length ) + '%' );
</span><ins>+ }
+ });
+
+ /**
+ * wp.media.view.Workspace.Library
+ */
+ media.view.Workspace.Library = media.view.Workspace.extend({
+ initialize: function() {
+ media.view.Workspace.prototype.initialize.apply( this, arguments );
+
+ // If this supports multiple attachments, initialize the sample toolbar view.
+ if ( this.controller.get('multiple') )
+ this.initToolbarView();
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> // Initializes the toolbar view. Currently uses defaults set for
</span><span class="lines">@@ -400,6 +419,8 @@
</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><ins>+ var controller = this.controller;
+
</ins><span class="cx"> this.toolbarView = new media.view.Toolbar({
</span><span class="cx"> items: {
</span><span class="cx"> 'selection-preview': new media.view.SelectionPreview({
</span><span class="lines">@@ -415,7 +436,10 @@
</span><span class="cx"> 'create-new-gallery': {
</span><span class="cx"> style: 'primary',
</span><span class="cx"> text: 'Create a new gallery',
</span><del>- priority: 30
</del><ins>+ priority: 30,
+ click: function() {
+ controller.render('gallery');
+ }
</ins><span class="cx"> },
</span><span class="cx"> 'add-to-gallery': {
</span><span class="cx"> text: 'Add to gallery',
</span><span class="lines">@@ -432,7 +456,54 @@
</span><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><ins>+ /**
+ * wp.media.view.Workspace.Gallery
+ */
+ media.view.Workspace.Gallery = media.view.Workspace.extend({
+ initialize: function() {
+ media.view.Workspace.prototype.initialize.apply( this, arguments );
+ this.initToolbarView();
+ },
</ins><span class="cx">
</span><ins>+ // Initializes the toolbar view. Currently uses defaults set for
+ // inserting media into a post. This should be pulled out into the
+ // appropriate workflow when the time comes, but is currently here
+ // to test multiple selections.
+ initToolbarView: function() {
+ var controller = this.controller;
+
+ this.toolbarView = new media.view.Toolbar({
+ items: {
+ 'return-to-library': {
+ text: 'Return to media library',
+ priority: -40,
+ click: function() {
+ controller.render('library');
+ }
+ },
+
+ 'insert-gallery-into-post': {
+ style: 'primary',
+ text: 'Insert gallery into post',
+ priority: 40,
+ click: function() {
+ controller.close();
+ }
+ },
+
+ 'add-images': {
+ text: 'Add images from media library',
+ priority: 30
+ }
+ }
+ });
+
+ this.$el.addClass('with-toolbar');
+ this.$content.append( this.toolbarView.$el );
+ }
+ });
+
+
</ins><span class="cx"> /**
</span><span class="cx"> * wp.media.view.Attachments
</span><span class="cx"> */
</span></span></pre>
</div>
</div>
</body>
</html>