<!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>[22658] trunk/wp-includes: Media: Remove unused batch edit states and strings.</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/22658">22658</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2012-11-19 03:11:48 +0000 (Mon, 19 Nov 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Media: Remove unused batch edit states and strings. see <a href="http://core.trac.wordpress.org/ticket/21390">#21390</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/media-views.js (22657 => 22658)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/media-views.js 2012-11-19 02:58:28 UTC (rev 22657)
+++ trunk/wp-includes/js/media-views.js 2012-11-19 03:11:48 UTC (rev 22658)
</span><span class="lines">@@ -1091,7 +1091,7 @@
</span><span class="cx">
</span><span class="cx"> createStates: function() {
</span><span class="cx"> var options = this.options,
</span><del>- main, gallery, batch;
</del><ins>+ main, gallery;
</ins><span class="cx">
</span><span class="cx"> main = {
</span><span class="cx"> multiple: this.options.multiple,
</span><span class="lines">@@ -1110,13 +1110,6 @@
</span><span class="cx"> excludeState: 'gallery-edit'
</span><span class="cx"> };
</span><span class="cx">
</span><del>- batch = {
- multiple: true,
- menu: 'batch',
- toolbar: 'batch-add',
- excludeState: 'batch-edit'
- };
-
</del><span class="cx"> // Add the default states.
</span><span class="cx"> this.states.add([
</span><span class="cx"> // Main states.
</span><span class="lines">@@ -1145,29 +1138,7 @@
</span><span class="cx">
</span><span class="cx"> new media.controller.Upload( _.defaults({
</span><span class="cx"> id: 'gallery-upload'
</span><del>- }, gallery ) ),
-
- // Batch states.
- new media.controller.Library({
- id: 'batch-edit',
- multiple: false,
- describe: true,
- edge: 199,
- sortable: true,
- searchable: false,
- 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 ) )
</del><ins>+ }, gallery ) )
</ins><span class="cx"> ]);
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -1176,7 +1147,6 @@
</span><span class="cx">
</span><span class="cx"> var handlers = {
</span><span class="cx"> menu: {
</span><del>- 'batch': 'batchMenu',
</del><span class="cx"> 'gallery': 'galleryMenu'
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -1192,8 +1162,6 @@
</span><span class="cx"> toolbar: {
</span><span class="cx"> 'main-attachments': 'mainAttachmentsToolbar',
</span><span class="cx"> 'main-embed': 'mainEmbedToolbar',
</span><del>- 'batch-edit': 'batchEditToolbar',
- 'batch-add': 'batchAddToolbar',
</del><span class="cx"> 'gallery-edit': 'galleryEditToolbar',
</span><span class="cx"> 'gallery-add': 'galleryAddToolbar'
</span><span class="cx"> }
</span><span class="lines">@@ -1224,43 +1192,6 @@
</span><span class="cx"> });
</span><span class="cx"> },
</span><span class="cx">
</span><del>- batchMenu: function() {
- var previous = this.previous(),
- frame = this;
-
- 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 media.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
- }
- }
- }) );
- },
-
</del><span class="cx"> galleryMenu: function() {
</span><span class="cx"> var previous = this.previous(),
</span><span class="cx"> frame = this;
</span><span class="lines">@@ -1397,54 +1328,6 @@
</span><span class="cx"> this.$el.removeClass('hide-toolbar');
</span><span class="cx"> },
</span><span class="cx">
</span><del>- 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');
- }
- }
- }
- }) );
- },
-
</del><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></pre></div>
<a id="trunkwpincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/media.php (22657 => 22658)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/media.php 2012-11-19 02:58:28 UTC (rev 22657)
+++ trunk/wp-includes/media.php 2012-11-19 03:11:48 UTC (rev 22658)
</span><span class="lines">@@ -1361,12 +1361,6 @@
</span><span class="cx"> 'embedFromUrlTitle' => __( 'Embed From URL' ),
</span><span class="cx"> 'insertEmbed' => __( 'Insert embed' ),
</span><span class="cx">
</span><del>- // Batch
- 'batchInsert' => __( 'Batch insert' ),
- 'cancelBatchTitle' => __( '&#8592; Cancel Batch' ),
- 'editBatchTitle' => __( 'Edit Batch' ),
- 'addToBatch' => __( 'Add to batch' ),
-
</del><span class="cx"> // Gallery
</span><span class="cx"> 'createGalleryTitle' => __( 'Create Gallery' ),
</span><span class="cx"> 'editGalleryTitle' => __( 'Edit Gallery' ),
</span></span></pre>
</div>
</div>
</body>
</html>