<!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>[22044] trunk: Media JS: Move the modal box's title from being stored in the modal view to being stored as an attribute on the 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/22044">22044</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2012-09-27 06:20:22 +0000 (Thu, 27 Sep 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Media JS: Move the modal box's title from being stored in the modal view to being stored as an attribute on the workflow. Update modal titles for both the post media and featured image workflows. see <a href="http://core.trac.wordpress.org/ticket/21390">#21390</a>, <a href="http://core.trac.wordpress.org/ticket/21776">#21776</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesmetaboxesphp">trunk/wp-admin/includes/meta-boxes.php</a></li>
<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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesmetaboxesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/meta-boxes.php (22043 => 22044)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/meta-boxes.php 2012-09-27 06:07:56 UTC (rev 22043)
+++ trunk/wp-admin/includes/meta-boxes.php 2012-09-27 06:20:22 UTC (rev 22044)
</span><span class="lines">@@ -1031,6 +1031,7 @@
</span><span class="cx">
</span><span class="cx"> if ( ! workflow ) {
</span><span class="cx"> workflow = wp.media({
</span><ins>+ title: title,
</ins><span class="cx"> library: {
</span><span class="cx"> type: 'image'
</span><span class="cx"> }
</span><span class="lines">@@ -1058,7 +1059,6 @@
</span><span class="cx"> width: size.width
</span><span class="cx"> }).prependTo( $element );
</span><span class="cx"> });
</span><del>- workflow.modal.title( title );
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> workflow.modal.open();
</span></span></pre></div>
<a id="trunkwpadminjsmediauploadjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/media-upload.js (22043 => 22044)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/media-upload.js 2012-09-27 06:07:56 UTC (rev 22043)
+++ trunk/wp-admin/js/media-upload.js 2012-09-27 06:20:22 UTC (rev 22044)
</span><span class="lines">@@ -103,6 +103,7 @@
</span><span class="cx"> return workflow;
</span><span class="cx">
</span><span class="cx"> workflow = workflows[ id ] = wp.media( _.defaults( options || {}, {
</span><ins>+ title: wp.media.view.l10n.insertMedia,
</ins><span class="cx"> multiple: true
</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 (22043 => 22044)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/media-views.js 2012-09-27 06:07:56 UTC (rev 22043)
+++ trunk/wp-includes/js/media-views.js 2012-09-27 06:20:22 UTC (rev 22044)
</span><span class="lines">@@ -19,6 +19,7 @@
</span><span class="cx"> */
</span><span class="cx"> media.controller.Workflow = Backbone.Model.extend({
</span><span class="cx"> defaults: {
</span><ins>+ title: '',
</ins><span class="cx"> multiple: false,
</span><span class="cx"> view: 'library',
</span><span class="cx"> library: {},
</span><span class="lines">@@ -193,9 +194,9 @@
</span><span class="cx">
</span><span class="cx"> initialize: function() {
</span><span class="cx"> this.controller = this.options.controller;
</span><ins>+ this.controller.on( 'change:title', this.render, this );
</ins><span class="cx">
</span><span class="cx"> _.defaults( this.options, {
</span><del>- title: '',
</del><span class="cx"> container: document.body
</span><span class="cx"> });
</span><span class="cx"> },
</span><span class="lines">@@ -208,7 +209,7 @@
</span><span class="cx"> // `this.$el.html()` from garbage collecting its events.
</span><span class="cx"> this.options.$content.detach();
</span><span class="cx">
</span><del>- this.$el.html( this.template( this.options ) );
</del><ins>+ this.$el.html( this.template( this.controller.toJSON() ) );
</ins><span class="cx"> this.$('.media-modal-content').append( this.options.$content );
</span><span class="cx"> return this;
</span><span class="cx"> },
</span><span class="lines">@@ -242,11 +243,6 @@
</span><span class="cx"> // Set and render the content.
</span><span class="cx"> this.options.$content = ( $content instanceof Backbone.View ) ? $content.$el : $content;
</span><span class="cx"> return this.render();
</span><del>- },
-
- title: function( title ) {
- this.options.title = title;
- return this.render();
</del><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>