<!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>[22583] trunk/wp-includes/js/media-views.js: Media: Unify the "Insert" and "Insert.Post" toolbars.</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/22583">22583</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2012-11-14 22:40:34 +0000 (Wed, 14 Nov 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Media: Unify the "Insert" and "Insert.Post" toolbars. 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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/media-views.js (22582 => 22583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/media-views.js 2012-11-14 22:22:55 UTC (rev 22582)
+++ trunk/wp-includes/js/media-views.js 2012-11-14 22:40:34 UTC (rev 22583)
</span><span class="lines">@@ -1248,7 +1248,7 @@
</span><span class="cx">
</span><span class="cx"> // Toolbars
</span><span class="cx"> mainAttachmentsToolbar: function() {
</span><del>- this.toolbar.view( new media.view.Toolbar.Insert.Post({
</del><ins>+ this.toolbar.view( new media.view.Toolbar.Insert({
</ins><span class="cx"> controller: this
</span><span class="cx"> }) );
</span><span class="cx"> },
</span><span class="lines">@@ -1738,8 +1738,25 @@
</span><span class="cx"> media.view.Toolbar.Insert = media.view.Toolbar.extend({
</span><span class="cx"> initialize: function() {
</span><span class="cx"> var controller = this.options.controller,
</span><del>- selection = controller.state().get('selection');
</del><ins>+ selection = controller.state().get('selection'),
+ selectionToLibrary;
</ins><span class="cx">
</span><ins>+ selectionToLibrary = function( state, filter ) {
+ return function() {
+ var controller = this.controller,
+ selection = controller.state().get('selection'),
+ edit = controller.get( state ),
+ models = filter ? filter( selection ) : selection.models;
+
+ edit.set( 'library', new media.model.Selection( models, {
+ props: selection.props.toJSON(),
+ multiple: true
+ }) );
+
+ this.controller.state( state );
+ };
+ };
+
</ins><span class="cx"> this.options.items = _.defaults( this.options.items || {}, {
</span><span class="cx"> selection: new media.view.Selection({
</span><span class="cx"> controller: controller,
</span><span class="lines">@@ -1757,39 +1774,8 @@
</span><span class="cx"> controller.state().trigger( 'insert', selection );
</span><span class="cx"> selection.clear();
</span><span class="cx"> }
</span><del>- }
- });
</del><ins>+ },
</ins><span class="cx">
</span><del>- media.view.Toolbar.prototype.initialize.apply( this, arguments );
- },
-
- refresh: function() {
- var selection = this.controller.state().get('selection');
- this.get('insert').model.set( 'disabled', ! selection.length );
- }
- });
-
- // wp.media.view.Toolbar.Insert.Post
- // ---------------------------------
- media.view.Toolbar.Insert.Post = media.view.Toolbar.Insert.extend({
- initialize: function() {
- var selectionToLibrary = function( state, filter ) {
- return function() {
- var controller = this.controller,
- selection = controller.state().get('selection'),
- edit = controller.get( state ),
- models = filter ? filter( selection ) : selection.models;
-
- edit.set( 'library', new media.model.Selection( models, {
- props: selection.props.toJSON(),
- multiple: true
- }) );
-
- this.controller.state( state );
- };
- };
-
- this.options.items = _.defaults( this.options.items || {}, {
</del><span class="cx"> gallery: {
</span><span class="cx"> text: l10n.createNewGallery,
</span><span class="cx"> priority: 40,
</span><span class="lines">@@ -1805,15 +1791,14 @@
</span><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><del>- media.view.Toolbar.Insert.prototype.initialize.apply( this, arguments );
</del><ins>+ media.view.Toolbar.prototype.initialize.apply( this, arguments );
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> refresh: function() {
</span><span class="cx"> var selection = this.controller.state().get('selection'),
</span><span class="cx"> count = selection.length;
</span><span class="cx">
</span><del>- // Call the parent's `refresh()` method.
- media.view.Toolbar.Insert.prototype.refresh.apply( this, arguments );
</del><ins>+ this.get('insert').model.set( 'disabled', ! selection.length );
</ins><span class="cx">
</span><span class="cx"> // Check if every attachment in the selection is an image.
</span><span class="cx"> this.get('gallery').$el.toggle( count > 1 && selection.any( function( attachment ) {
</span></span></pre>
</div>
</div>
</body>
</html>