<!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>[22496] trunk/wp-admin/includes/meta-boxes.php: Media: Update featured images to use the media frame.</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/22496">22496</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2012-11-09 10:13:39 +0000 (Fri, 09 Nov 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Media: Update featured images to use the media frame. fixes <a href="http://core.trac.wordpress.org/ticket/21776">#21776</a>, see <a href="http://core.trac.wordpress.org/ticket/21390">#21390</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesmetaboxesphp">trunk/wp-admin/includes/meta-boxes.php</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 (22495 => 22496)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/meta-boxes.php 2012-11-09 09:59:36 UTC (rev 22495)
+++ trunk/wp-admin/includes/meta-boxes.php 2012-11-09 10:13:39 UTC (rev 22496)
</span><span class="lines">@@ -1009,7 +1009,7 @@
</span><span class="cx"> $thumbnailId = $element.find('input[name="thumbnail_id"]'),
</span><span class="cx"> title = '<?php _e( "Choose a Featured Image" ); ?>',
</span><span class="cx"> update = '<?php _e( "Update Featured Image" ); ?>',
</span><del>- frame, selection, setFeaturedImage;
</del><ins>+ frame, setFeaturedImage;
</ins><span class="cx">
</span><span class="cx"> setFeaturedImage = function( thumbnailId ) {
</span><span class="cx"> $element.find('img').remove();
</span><span class="lines">@@ -1020,52 +1020,50 @@
</span><span class="cx"> $element.on( 'click', '.choose, img', function( event ) {
</span><span class="cx"> event.preventDefault();
</span><span class="cx">
</span><del>- if ( ! frame ) {
- frame = wp.media({
- title: title,
- library: {
- type: 'image'
- }
- });
</del><ins>+ if ( frame ) {
+ frame.open();
+ return;
+ }
</ins><span class="cx">
</span><del>- frame.toolbar( new wp.media.view.Toolbar({
- controller: frame,
- items: {
- update: {
- style: 'primary',
- text: update,
- priority: 40,
</del><ins>+ frame = wp.media({
+ title: title,
+ selection: [ wp.media.model.Attachment.get( $thumbnailId.val() ) ],
+ library: {
+ type: 'image'
+ }
+ });
</ins><span class="cx">
</span><del>- click: function() {
- var selection = frame.state().get('selection'),
- model = selection.first(),
- sizes = model.get('sizes'),
- size;
</del><ins>+ frame.toolbar.on( 'activate:select', function() {
+ frame.toolbar.view().add({
+ select: {
+ text: update,
</ins><span class="cx">
</span><del>- setFeaturedImage( model.id );
</del><ins>+ click: function() {
+ var selection = frame.state().get('selection'),
+ model = selection.first(),
+ sizes = model.get('sizes'),
+ size;
</ins><span class="cx">
</span><del>- // @todo: might need a size hierarchy equivalent.
- if ( sizes )
- size = sizes['post-thumbnail'] || sizes.medium;
</del><ins>+ setFeaturedImage( model.id );
</ins><span class="cx">
</span><del>- // @todo: Need a better way of accessing full size
- // data besides just calling toJSON().
- size = size || model.toJSON();
</del><ins>+ // @todo: might need a size hierarchy equivalent.
+ if ( sizes )
+ size = sizes['post-thumbnail'] || sizes.medium;
</ins><span class="cx">
</span><del>- frame.close();
- selection.clear();
</del><ins>+ // @todo: Need a better way of accessing full size
+ // data besides just calling toJSON().
+ size = size || model.toJSON();
</ins><span class="cx">
</span><del>- $( '<img />', {
- src: size.url,
- width: size.width
- }).prependTo( $element );
- }
</del><ins>+ frame.close();
+
+ $( '<img />', {
+ src: size.url,
+ width: size.width
+ }).prependTo( $element );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><del>- }) );
- }
-
- frame.open();
</del><ins>+ });
+ });
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> $element.on( 'click', '.remove', function( event ) {
</span></span></pre>
</div>
</div>
</body>
</html>