<!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>[22072] trunk: Add QuickPress support for new media 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/22072">22072</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2012-09-27 20:04:34 +0000 (Thu, 27 Sep 2012)</dd>
</dl>

<h3>Log Message</h3>
<pre>Add QuickPress support for new media workflow.

* Adds the code required to include the new media scripts, styles, and settings to `media_button()`.
* Improves script dependencies, namely making `media-upload` require `media-views`.
* Some CSS tweaks for the making the new button work well with QuickPress.

see <a href="http://core.trac.wordpress.org/ticket/21390">#21390</a>, fixes <a href="http://core.trac.wordpress.org/ticket/22021">#22021</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmincsswpadmincss">trunk/wp-admin/css/wp-admin.css</a></li>
<li><a href="#trunkwpadmineditformadvancedphp">trunk/wp-admin/edit-form-advanced.php</a></li>
<li><a href="#trunkwpadminincludesmediaphp">trunk/wp-admin/includes/media.php</a></li>
<li><a href="#trunkwpadminjsmediauploadjs">trunk/wp-admin/js/media-upload.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="trunkwpadmincsswpadmincss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/wp-admin.css (22071 => 22072)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/wp-admin.css        2012-09-27 19:21:47 UTC (rev 22071)
+++ trunk/wp-admin/css/wp-admin.css        2012-09-27 20:04:34 UTC (rev 22072)
</span><span class="lines">@@ -6216,7 +6216,7 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> #dashboard_quick_press .wp-media-buttons {
</span><del>-        margin: 0 0 .2em 8px;
</del><ins>+        margin: 0 0 .2em 1px;
</ins><span class="cx">         padding: 0;
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkwpadmineditformadvancedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-form-advanced.php (22071 => 22072)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-form-advanced.php        2012-09-27 19:21:47 UTC (rev 22071)
+++ trunk/wp-admin/edit-form-advanced.php        2012-09-27 20:04:34 UTC (rev 22072)
</span><span class="lines">@@ -17,13 +17,11 @@
</span><span class="cx"> 
</span><span class="cx"> if ( post_type_supports($post_type, 'editor') || post_type_supports($post_type, 'thumbnail') ) {
</span><span class="cx">         add_thickbox();
</span><del>-        wp_enqueue_script('media-upload');
-        wp_enqueue_script( 'media-views' );
</del><ins>+
+        wp_enqueue_script( 'media-upload' );
</ins><span class="cx">         wp_enqueue_style( 'media-views' );
</span><span class="cx">         wp_plupload_default_settings();
</span><span class="cx">         add_action( 'admin_footer', 'wp_print_media_templates' );
</span><del>-
-        wp_enqueue_script( 'mce-view' );
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkwpadminincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/media.php (22071 => 22072)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/media.php        2012-09-27 19:21:47 UTC (rev 22071)
+++ trunk/wp-admin/includes/media.php        2012-09-27 20:04:34 UTC (rev 22072)
</span><span class="lines">@@ -377,6 +377,11 @@
</span><span class="cx">  * @param string $editor_id
</span><span class="cx">  */
</span><span class="cx"> function media_buttons($editor_id = 'content') {
</span><ins>+        wp_enqueue_script( 'media-upload' );
+        wp_enqueue_style( 'media-views' );
+        wp_plupload_default_settings();
+        add_action( 'admin_footer', 'wp_print_media_templates' );
+
</ins><span class="cx">         $context = apply_filters('media_buttons_context', __('Upload/Insert %s'));
</span><span class="cx"> 
</span><span class="cx">         $img = '&lt;img src=&quot;' . esc_url( admin_url( 'images/media-button.png?ver=20111005' ) ) . '&quot; width=&quot;16&quot; height=&quot;16&quot; /&gt;';
</span></span></pre></div>
<a id="trunkwpadminjsmediauploadjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/media-upload.js (22071 => 22072)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/media-upload.js        2012-09-27 19:21:47 UTC (rev 22071)
+++ trunk/wp-admin/js/media-upload.js        2012-09-27 20:04:34 UTC (rev 22072)
</span><span class="lines">@@ -148,5 +148,5 @@
</span><span class="cx">                 }
</span><span class="cx">         };
</span><span class="cx"> 
</span><del>-        $( wp.mce.media.init )
</del><ins>+        $( wp.mce.media.init );
</ins><span class="cx"> }(jQuery));
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpincludesscriptloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/script-loader.php (22071 => 22072)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/script-loader.php        2012-09-27 19:21:47 UTC (rev 22071)
+++ trunk/wp-includes/script-loader.php        2012-09-27 20:04:34 UTC (rev 22072)
</span><span class="lines">@@ -297,7 +297,7 @@
</span><span class="cx">                 'type' =&gt; 'characters' == _x( 'words', 'word count: words or characters?' ) ? 'c' : 'w',
</span><span class="cx">         ) );
</span><span class="cx"> 
</span><del>-        $scripts-&gt;add( 'media-upload', &quot;/wp-admin/js/media-upload$suffix.js&quot;, array( 'thickbox', 'mce-view' ), false, 1 );
</del><ins>+        $scripts-&gt;add( 'media-upload', &quot;/wp-admin/js/media-upload$suffix.js&quot;, array( 'thickbox', 'mce-view', 'media-views' ), false, 1 );
</ins><span class="cx"> 
</span><span class="cx">         $scripts-&gt;add( 'hoverIntent', &quot;/wp-includes/js/hoverIntent$suffix.js&quot;, array('jquery'), 'r6', 1 );
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>