<!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>[23989] trunk: Constrain large videos from rendering bigger than $content_width on both frontend and backend.</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/23989">23989</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2013-04-14 16:43:26 +0000 (Sun, 14 Apr 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Constrain large videos from rendering bigger than $content_width on both frontend and backend.
props wonderboymusic. fixes <a href="http://core.trac.wordpress.org/ticket/23955">#23955</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminjspostformatsjs">trunk/wp-admin/js/post-formats.js</a></li>
<li><a href="#trunkwpcontentthemestwentythirteenfunctionsphp">trunk/wp-content/themes/twentythirteen/functions.php</a></li>
<li><a href="#trunkwpincludesmediaphp">trunk/wp-includes/media.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminjspostformatsjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/post-formats.js (23988 => 23989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/post-formats.js 2013-04-14 10:33:44 UTC (rev 23988)
+++ trunk/wp-admin/js/post-formats.js 2013-04-14 16:43:26 UTC (rev 23989)
</span><span class="lines">@@ -111,15 +111,24 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> mediaPreview = function (attachment) {
</span><del>- var dimensions = '', url = attachment.url,
</del><ins>+ var w, h, dimensions = '', url = attachment.url,
</ins><span class="cx"> mime = attachment.mime,
</span><span class="cx"> format = attachment.type;
</span><span class="cx">
</span><span class="cx"> if ( 'video' === format ) {
</span><del>- if ( attachment.width )
- dimensions += ' width="' + attachment.width + '"';
- if ( attachment.height )
- dimensions += ' height="' + attachment.height + '"';
</del><ins>+ if ( attachment.width ) {
+ w = attachment.width;
+ if ( w > 600 )
+ w = 600;
+ dimensions += ' width="' + w + '"';
+ }
+
+ if ( attachment.height ) {
+ h = attachment.height;
+ if ( attachment.width && w < attachment.width )
+ h = Math.round( ( h * w ) / attachment.width );
+ dimensions += ' height="' + h + '"';
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $('#' + format + '-preview').remove();
</span></span></pre></div>
<a id="trunkwpcontentthemestwentythirteenfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentythirteen/functions.php (23988 => 23989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentythirteen/functions.php 2013-04-14 10:33:44 UTC (rev 23988)
+++ trunk/wp-content/themes/twentythirteen/functions.php 2013-04-14 16:43:26 UTC (rev 23989)
</span><span class="lines">@@ -547,8 +547,11 @@
</span><span class="cx"> * @return array Filtered attribute list.
</span><span class="cx"> */
</span><span class="cx"> function twentythirteen_video_width( $atts ) {
</span><del>- if ( has_post_format( 'video' ) )
- $atts['width'] = 724;
</del><ins>+ if ( ! is_admin() && has_post_format( 'video' ) ) {
+ $new_width = 724;
+ $atts['height'] = round( ( $atts['height'] * $new_width ) / $atts['width'] );
+ $atts['width'] = $new_width;
+ }
</ins><span class="cx">
</span><span class="cx"> return $atts;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/media.php (23988 => 23989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/media.php 2013-04-14 10:33:44 UTC (rev 23988)
+++ trunk/wp-includes/media.php 2013-04-14 16:43:26 UTC (rev 23989)
</span><span class="lines">@@ -956,12 +956,25 @@
</span><span class="cx"> 'height' => 360,
</span><span class="cx"> 'width' => empty( $content_width ) ? 640 : $content_width,
</span><span class="cx"> );
</span><ins>+
</ins><span class="cx"> foreach ( $default_types as $type )
</span><span class="cx"> $defaults_atts[$type] = '';
</span><span class="cx">
</span><span class="cx"> $atts = shortcode_atts( $defaults_atts, $attr, 'video' );
</span><span class="cx"> extract( $atts );
</span><span class="cx">
</span><ins>+ $w = $width;
+ $h = $height;
+ if ( is_admin() && $width > 600 )
+ $w = 600;
+ elseif ( ! is_admin() && $w > $defaults_atts['width'] )
+ $w = $defaults_atts['width'];
+
+ if ( $w < $width )
+ $height = round( ( $h * $w ) / $width );
+
+ $width = $w;
+
</ins><span class="cx"> $primary = false;
</span><span class="cx"> if ( ! empty( $src ) ) {
</span><span class="cx"> $type = wp_check_filetype( $src );
</span></span></pre>
</div>
</div>
</body>
</html>