<!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>[22480] trunk: Media: Add batch insertion workflow.</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/22480">22480</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2012-11-09 01:44:02 +0000 (Fri, 09 Nov 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Media: Add batch insertion workflow. see <a href="http://core.trac.wordpress.org/ticket/21390">#21390</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminjsmediauploadjs">trunk/wp-admin/js/media-upload.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 (22479 => 22480)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/media-upload.js 2012-11-09 01:34:48 UTC (rev 22479)
+++ trunk/wp-admin/js/media-upload.js 2012-11-09 01:44:02 UTC (rev 22480)
</span><span class="lines">@@ -107,11 +107,12 @@
</span><span class="cx"> multiple: true
</span><span class="cx"> } ) );
</span><span class="cx">
</span><del>- workflow.on( 'insert', function() {
</del><ins>+ workflow.on( 'insert', function( selection ) {
</ins><span class="cx"> var state = workflow.state(),
</span><del>- selection = state.get('selection'),
</del><span class="cx"> details = state.get('details');
</span><span class="cx">
</span><ins>+ selection = selection || state.get('selection');
+
</ins><span class="cx"> if ( ! selection || ! details )
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/media-views.js (22479 => 22480)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/media-views.js 2012-11-09 01:34:48 UTC (rev 22479)
+++ trunk/wp-includes/js/media-views.js 2012-11-09 01:44:02 UTC (rev 22480)
</span><span class="lines">@@ -700,7 +700,7 @@
</span><span class="cx">
</span><span class="cx"> createStates: function() {
</span><span class="cx"> var options = this.options,
</span><del>- main, gallery;
</del><ins>+ main, gallery, batch;
</ins><span class="cx">
</span><span class="cx"> main = {
</span><span class="cx"> multiple: this.options.multiple,
</span><span class="lines">@@ -713,13 +713,22 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> gallery = {
</span><del>- multiple: true,
- menu: 'gallery',
- toolbar: 'gallery-add'
</del><ins>+ multiple: true,
+ menu: 'gallery',
+ toolbar: 'gallery-add',
+ excludeState: 'gallery-edit'
</ins><span class="cx"> };
</span><span class="cx">
</span><ins>+ batch = {
+ multiple: true,
+ menu: 'batch',
+ toolbar: 'batch-add',
+ excludeState: 'batch-edit'
+ };
+
</ins><span class="cx"> // Add the default states.
</span><span class="cx"> this.states.add([
</span><ins>+ // Main states.
</ins><span class="cx"> new media.controller.Library( _.defaults({
</span><span class="cx"> selection: options.selection,
</span><span class="cx"> library: media.query( options.library )
</span><span class="lines">@@ -727,6 +736,7 @@
</span><span class="cx">
</span><span class="cx"> new media.controller.Upload( main ),
</span><span class="cx">
</span><ins>+ // Gallery states.
</ins><span class="cx"> new media.controller.Gallery({
</span><span class="cx"> editing: options.editing,
</span><span class="cx"> menu: 'gallery'
</span><span class="lines">@@ -734,14 +744,33 @@
</span><span class="cx">
</span><span class="cx"> new media.controller.Library( _.defaults({
</span><span class="cx"> id: 'gallery-library',
</span><del>- library: media.query({ type: 'image' }),
- excludeState: 'gallery-edit'
</del><ins>+ library: media.query({ type: 'image' })
</ins><span class="cx"> }, gallery ) ),
</span><span class="cx">
</span><span class="cx"> new media.controller.Upload( _.defaults({
</span><del>- id: 'gallery-upload',
- excludeState: 'gallery-edit'
- }, gallery ) )
</del><ins>+ id: 'gallery-upload'
+ }, gallery ) ),
+
+ // Batch states.
+ new media.controller.Library({
+ id: 'batch-edit',
+ multiple: false,
+ describe: true,
+ edge: 199,
+ sortable: true,
+ menu: 'batch',
+ toolbar: 'batch-edit',
+ sidebar: 'attachment-settings'
+ }),
+
+ new media.controller.Library( _.defaults({
+ id: 'batch-library',
+ library: media.query({ type: 'image' })
+ }, batch ) ),
+
+ new media.controller.Upload( _.defaults({
+ id: 'batch-upload'
+ }, batch ) )
</ins><span class="cx"> ]);
</span><span class="cx">
</span><span class="cx"> // Set the default state.
</span><span class="lines">@@ -773,8 +802,43 @@
</span><span class="cx"> }) );
</span><span class="cx"> },
</span><span class="cx">
</span><del>- batchMenu: function() {},
</del><ins>+ batchMenu: function() {
+ var previous = this.previous(),
+ frame = this;
</ins><span class="cx">
</span><ins>+ this.menu.view( new media.view.Menu({
+ controller: this,
+ views: {
+ cancel: {
+ text: l10n.cancelBatchTitle,
+ priority: 20,
+ click: function() {
+ if ( previous )
+ frame.state( previous );
+ else
+ frame.close();
+ }
+ },
+ separateCancel: new Backbone.View({
+ className: 'separator',
+ priority: 40
+ }),
+ 'batch-edit': {
+ text: l10n.editBatchTitle,
+ priority: 60
+ },
+ 'batch-upload': {
+ text: l10n.uploadFilesTitle,
+ priority: 80
+ },
+ 'batch-library': {
+ text: l10n.mediaLibraryTitle,
+ priority: 100
+ }
+ }
+ }) );
+ },
+
</ins><span class="cx"> galleryMenu: function() {
</span><span class="cx"> var previous = this.previous(),
</span><span class="cx"> frame = this;
</span><span class="lines">@@ -810,7 +874,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }) );
</span><del>-
</del><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> // Content
</span><span class="lines">@@ -900,9 +963,55 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> mainEmbedToolbar: function() {},
</span><del>- batchEditToolbar: function() {},
- batchAddToolbar: function() {},
</del><span class="cx">
</span><ins>+ batchEditToolbar: function() {
+ this.toolbar.view( new media.view.Toolbar({
+ controller: this,
+ items: {
+ insert: {
+ style: 'primary',
+ text: l10n.insertIntoPost,
+ priority: 80,
+
+ click: function() {
+ var controller = this.controller,
+ state = controller.state();
+
+ controller.close();
+ state.trigger( 'insert', state.get('library') );
+
+ controller.reset();
+ // @todo: Make the state activated dynamic (instead of hardcoded).
+ controller.state('upload');
+ }
+ }
+ }
+ }) );
+ },
+
+ batchAddToolbar: function() {
+ this.toolbar.view( new media.view.Toolbar({
+ controller: this,
+ items: {
+ insert: {
+ style: 'primary',
+ text: l10n.addToBatch,
+ priority: 80,
+
+ click: function() {
+ var controller = this.controller,
+ state = controller.state(),
+ edit = controller.get('batch-edit');
+
+ edit.get('library').add( state.get('selection').models );
+ state.trigger('reset');
+ controller.state('batch-edit');
+ }
+ }
+ }
+ }) );
+ },
+
</ins><span class="cx"> galleryEditToolbar: function() {
</span><span class="cx"> var editing = this.state().get('editing');
</span><span class="cx"> this.toolbar.view( new media.view.Toolbar({
</span><span class="lines">@@ -1292,32 +1401,32 @@
</span><span class="cx"> // ---------------------------------
</span><span class="cx"> media.view.Toolbar.Insert.Post = media.view.Toolbar.Insert.extend({
</span><span class="cx"> initialize: function() {
</span><del>- this.options.items = _.defaults( this.options.items || {}, {
- gallery: {
- text: l10n.createNewGallery,
- priority: 40,
-
- click: function() {
</del><ins>+ var selectionToLibrary = function( state ) {
+ return function() {
</ins><span class="cx"> var controller = this.controller,
</span><span class="cx"> selection = controller.state().get('selection'),
</span><del>- edit = controller.get('gallery-edit');
</del><ins>+ edit = controller.get( state );
</ins><span class="cx">
</span><span class="cx"> edit.set( 'library', new media.model.Selection( selection.models, {
</span><span class="cx"> props: selection.props.toJSON(),
</span><span class="cx"> multiple: true
</span><span class="cx"> }) );
</span><span class="cx">
</span><del>- this.controller.state('gallery-edit');
- }
</del><ins>+ this.controller.state( state );
+ };
+ };
+
+ this.options.items = _.defaults( this.options.items || {}, {
+ gallery: {
+ text: l10n.createNewGallery,
+ priority: 40,
+ click: selectionToLibrary('gallery-edit')
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> batch: {
</span><span class="cx"> text: l10n.batchInsert,
</span><span class="cx"> priority: 60,
</span><del>-
- click: function() {
- this.controller.state('batch-edit');
- }
</del><ins>+ click: selectionToLibrary('batch-edit')
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -1337,12 +1446,10 @@
</span><span class="cx"> }) );
</span><span class="cx">
</span><span class="cx"> // Batch insert shows for multiple selected attachments.
</span><del>- // Temporarily disabled with `false &&`.
- this.get('batch').$el.toggle( false && count > 1 );
</del><ins>+ this.get('batch').$el.toggle( count > 1 );
</ins><span class="cx">
</span><span class="cx"> // Insert only shows for single attachments.
</span><del>- // Temporarily disabled.
- // this.get('insert').$el.toggle( count <= 1 );
</del><ins>+ this.get('insert').$el.toggle( count <= 1 );
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesscriptloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/script-loader.php (22479 => 22480)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/script-loader.php 2012-11-09 01:34:48 UTC (rev 22479)
+++ trunk/wp-includes/script-loader.php 2012-11-09 01:44:02 UTC (rev 22480)
</span><span class="lines">@@ -338,7 +338,6 @@
</span><span class="cx"> 'mediaLibraryTitle' => __( 'Media Library' ),
</span><span class="cx"> 'createNewGallery' => __( 'Create a new gallery' ),
</span><span class="cx"> 'insertIntoPost' => __( 'Insert into post' ),
</span><del>- 'addToGallery' => __( 'Add to gallery' ),
</del><span class="cx">
</span><span class="cx"> // Embed
</span><span class="cx"> 'embedFromUrlTitle' => __( 'Embed From URL' ),
</span><span class="lines">@@ -346,6 +345,8 @@
</span><span class="cx"> // Batch
</span><span class="cx"> 'batchInsert' => __( 'Batch insert' ),
</span><span class="cx"> 'cancelBatchTitle' => __( '&#8592; Cancel Batch' ),
</span><ins>+ 'editBatchTitle' => __( 'Edit Batch' ),
+ 'addToBatch' => __( 'Add to batch' ),
</ins><span class="cx">
</span><span class="cx"> // Gallery
</span><span class="cx"> 'createGalleryTitle' => __( 'Create Gallery' ),
</span><span class="lines">@@ -354,6 +355,7 @@
</span><span class="cx"> 'insertGallery' => __( 'Insert gallery' ),
</span><span class="cx"> 'updateGallery' => __( 'Update gallery' ),
</span><span class="cx"> 'continueEditing' => __( 'Continue editing' ),
</span><ins>+ 'addToGallery' => __( 'Add to gallery' ),
</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>