<!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>[22597] trunk/wp-includes/js: Media: Only show the edit selection link for 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/22597">22597</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2012-11-15 03:09:35 +0000 (Thu, 15 Nov 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Media: Only show the edit selection link for the media library. Make the upload attachments list sortable. Only retain the `silent` option when running `Attachments.validate()`. see <a href="http://core.trac.wordpress.org/ticket/21390">#21390</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesjsmediamodelsjs">trunk/wp-includes/js/media-models.js</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="trunkwpincludesjsmediamodelsjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/media-models.js (22596 => 22597)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/media-models.js 2012-11-15 02:58:37 UTC (rev 22596)
+++ trunk/wp-includes/js/media-models.js 2012-11-15 03:09:35 UTC (rev 22597)
</span><span class="lines">@@ -358,6 +358,11 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> validate: function( attachment, options ) {
</span><ins>+ // Only retain the `silent` option.
+ options = {
+ silent: options && options.silent
+ };
+
</ins><span class="cx"> return this[ this.validator( attachment ) ? 'add' : 'remove' ]( attachment, options );
</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 (22596 => 22597)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/media-views.js 2012-11-15 02:58:37 UTC (rev 22596)
+++ trunk/wp-includes/js/media-views.js 2012-11-15 03:09:35 UTC (rev 22597)
</span><span class="lines">@@ -458,9 +458,10 @@
</span><span class="cx"> // ---------------------------
</span><span class="cx"> media.controller.Upload = media.controller.Library.extend({
</span><span class="cx"> defaults: _.defaults({
</span><del>- id: 'upload',
- upload: { text: l10n.uploadMoreFiles },
- searchable: false
</del><ins>+ id: 'upload',
+ upload: { text: l10n.uploadMoreFiles },
+ searchable: false,
+ sortable: true
</ins><span class="cx"> }, media.controller.Library.prototype.defaults ),
</span><span class="cx">
</span><span class="cx"> initialize: function() {
</span><span class="lines">@@ -471,10 +472,6 @@
</span><span class="cx"> // all uploading) attachments.
</span><span class="cx"> if ( ! library ) {
</span><span class="cx"> library = new Attachments();
</span><del>- library.props.set({
- orderby: 'date',
- order: 'ASC'
- });
</del><span class="cx"> library.observe( wp.Uploader.queue );
</span><span class="cx"> this.set( 'library', library );
</span><span class="cx"> }
</span><span class="lines">@@ -995,7 +992,8 @@
</span><span class="cx"> // Main states.
</span><span class="cx"> new media.controller.Library( _.defaults({
</span><span class="cx"> selection: options.selection,
</span><del>- library: media.query( options.library )
</del><ins>+ library: media.query( options.library ),
+ editable: true
</ins><span class="cx"> }, main ) ),
</span><span class="cx">
</span><span class="cx"> new media.controller.Upload( main ),
</span><span class="lines">@@ -1256,7 +1254,8 @@
</span><span class="cx"> // Toolbars
</span><span class="cx"> mainAttachmentsToolbar: function() {
</span><span class="cx"> this.toolbar.view( new media.view.Toolbar.Insert({
</span><del>- controller: this
</del><ins>+ controller: this,
+ editable: this.state().get('editable')
</ins><span class="cx"> }) );
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -1770,7 +1769,9 @@
</span><span class="cx"> collection: selection,
</span><span class="cx"> priority: -40,
</span><span class="cx">
</span><del>- editable: function() {
</del><ins>+ // If the selection is editable, pass the callback to
+ // switch the content mode.
+ editable: this.options.editable && function() {
</ins><span class="cx"> this.controller.content.mode('edit-selection');
</span><span class="cx"> }
</span><span class="cx"> }).render(),
</span></span></pre>
</div>
</div>
</body>
</html>