<!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>[23969] trunk: Enforce video dimensions.</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/23969">23969</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2013-04-11 22:34:05 +0000 (Thu, 11 Apr 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>Enforce video dimensions.

props wonderboymusic. see <a href="http://core.trac.wordpress.org/ticket/23831">#23831</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminjspostformatsjs">trunk/wp-admin/js/post-formats.js</a></li>
<li><a href="#trunkwpincludesjsmediaeditorjs">trunk/wp-includes/js/media-editor.js</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 (23968 => 23969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/post-formats.js        2013-04-11 22:13:44 UTC (rev 23968)
+++ trunk/wp-admin/js/post-formats.js        2013-04-11 22:34:05 UTC (rev 23969)
</span><span class="lines">@@ -110,10 +110,21 @@
</span><span class="cx">                                 }
</span><span class="cx">                         });
</span><span class="cx"> 
</span><del>-                        mediaPreview = function (format, url, mime) {
</del><ins>+                        mediaPreview = function (attachment) {
+                                var dimensions = '', url = attachment.url,
+                                        mime = attachment.mime,
+                                        format = attachment.type;
+
+                                if ( 'video' === format ) {
+                                        if ( attachment.width )
+                                                dimensions += ' width=&quot;' + attachment.width + '&quot;';
+                                        if ( attachment.height )
+                                                dimensions += ' height=&quot;' + attachment.height + '&quot;';
+                                }
+
</ins><span class="cx">                                 $('#' + format + '-preview').remove();
</span><span class="cx">                                 $holder.parent().prepend( '&lt;div id=&quot;' + format + '-preview&quot; class=&quot;wp-format-media-preview&quot;&gt;' +
</span><del>-                                        '&lt;' + format + ' class=&quot;wp-' + format + '-shortcode&quot; controls=&quot;controls&quot; preload=&quot;none&quot;&gt;' +
</del><ins>+                                        '&lt;' + format + dimensions + ' class=&quot;wp-' + format + '-shortcode&quot; controls=&quot;controls&quot; preload=&quot;none&quot;&gt;' +
</ins><span class="cx">                                                 '&lt;source type=&quot;' + mime + '&quot; src=&quot;' + url + '&quot; /&gt;' +
</span><span class="cx">                                         '&lt;/' + format + '&gt;&lt;/div&gt;' );
</span><span class="cx">                                 $('.wp-' + format + '-shortcode').mediaelementplayer();
</span><span class="lines">@@ -122,25 +133,25 @@
</span><span class="cx">                         // When an image is selected, run a callback.
</span><span class="cx">                         mediaFrame.on( 'select', function () {
</span><span class="cx">                                 // Grab the selected attachment.
</span><del>-                                var attachment = mediaFrame.state().get('selection').first(), mime, url, id;
</del><ins>+                                var attachment = mediaFrame.state().get('selection').first().toJSON();
</ins><span class="cx"> 
</span><del>-                                id = attachment.get('id');
-                                url = attachment.get('url');
-                                mime = attachment.get('mime');
-
-                                if ( 0 === mime.indexOf('audio') ) {
-                                        $field.val(url);
</del><ins>+                                if ( 0 === attachment.mime.indexOf('audio') ) {
+                                        $field.val(attachment.url);
</ins><span class="cx">                                         // show one preview at a time
</span><del>-                                        mediaPreview('audio', url, mime);
-                                } else if ( 0 === mime.indexOf('video') ) {
-                                        $field.val(url);
</del><ins>+                                        mediaPreview(attachment);
+                                } else if ( 0 === attachment.mime.indexOf('video') ) {
+                                        attachment.src = attachment.url;
+                                        $field.val(wp.shortcode.string({
+                                                tag:     'video',
+                                                attrs: _.pick( attachment, 'src', 'width', 'height' )
+                                        }));
</ins><span class="cx">                                         // show one preview at a time
</span><del>-                                        mediaPreview('video', url, mime);
</del><ins>+                                        mediaPreview(attachment);
</ins><span class="cx">                                 } else {
</span><span class="cx">                                         // set the hidden input's value
</span><del>-                                        $field.val(id);
</del><ins>+                                        $field.val(attachment.id);
</ins><span class="cx">                                         // Show the image in the placeholder
</span><del>-                                        $el.html('&lt;img src=&quot;' + url + '&quot; /&gt;');
</del><ins>+                                        $el.html('&lt;img src=&quot;' + attachment.url + '&quot; /&gt;');
</ins><span class="cx">                                         $holder.removeClass('empty').show();
</span><span class="cx">                                 }
</span><span class="cx">                         });
</span></span></pre></div>
<a id="trunkwpincludesjsmediaeditorjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/media-editor.js (23968 => 23969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/media-editor.js        2013-04-11 22:13:44 UTC (rev 23968)
+++ trunk/wp-includes/js/media-editor.js        2013-04-11 22:34:05 UTC (rev 23969)
</span><span class="lines">@@ -144,6 +144,12 @@
</span><span class="cx"> 
</span><span class="cx">                         shortcode = {};
</span><span class="cx"> 
</span><ins>+                        if ( attachment.width )
+                                shortcode.width = attachment.width;
+
+                        if ( attachment.height )
+                                shortcode.height = attachment.height;
+
</ins><span class="cx">                         if ( props.mime ) {
</span><span class="cx">                                 switch ( props.mime ) {
</span><span class="cx">                                 case 'video/mp4':
</span></span></pre></div>
<a id="trunkwpincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/media.php (23968 => 23969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/media.php        2013-04-11 22:13:44 UTC (rev 23968)
+++ trunk/wp-includes/media.php        2013-04-11 22:34:05 UTC (rev 23969)
</span><span class="lines">@@ -1638,6 +1638,11 @@
</span><span class="cx">                 }
</span><span class="cx"> 
</span><span class="cx">                 $response = array_merge( $response, array( 'sizes' =&gt; $sizes ), $sizes['full'] );
</span><ins>+        } elseif ( $meta &amp;&amp; 'video' === $type ) {
+                if ( isset( $meta['width'] ) )
+                        $response['width'] = (int) $meta['width'];
+                if ( isset( $meta['height'] ) )
+                        $response['height'] = (int) $meta['height'];
</ins><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         if ( function_exists('get_compat_media_markup') )
</span><span class="lines">@@ -2014,6 +2019,15 @@
</span><span class="cx">                 if ( ! empty( $rawattr['width'] ) &amp;&amp; ! empty( $rawattr['height'] ) ) {
</span><span class="cx">                         $dimensions .= sprintf( 'width=&quot;%d&quot; ', (int) $rawattr['width'] );
</span><span class="cx">                         $dimensions .= sprintf( 'height=&quot;%d&quot; ', (int) $rawattr['height'] );
</span><ins>+                } elseif ( strstr( $url, home_url() ) ) {
+                        $id = attachment_url_to_postid( $url );
+                        if ( ! empty( $id ) ) {
+                                $meta = wp_get_attachment_metadata( $id );
+                                if ( ! empty( $meta['width'] ) )
+                                        $dimensions .= sprintf( 'width=&quot;%d&quot; ', (int) $meta['width'] );
+                                if ( ! empty( $meta['height'] ) )
+                                        $dimensions .= sprintf( 'height=&quot;%d&quot; ', (int) $meta['height'] );
+                        }
</ins><span class="cx">                 }
</span><span class="cx">                 $video = do_shortcode( '[video ' . $dimensions . 'src=&quot;' . $url . '&quot; /]' );
</span><span class="cx">         }
</span><span class="lines">@@ -2437,4 +2451,25 @@
</span><span class="cx">  */
</span><span class="cx"> function the_post_format_image( $attached_size = 'full' ) {
</span><span class="cx">         echo get_the_post_format_image( $attached_size );
</span><ins>+}
+
+/**
+ * Retrieve the post id for an attachment file URL
+ *
+ * @since 3.6.0
+ *
+ * @param string $url Permalink to check.
+ * @return int Post ID, or 0 on failure.
+ */
+function attachment_url_to_postid( $url ) {
+        global $wpdb;
+        if ( preg_match( '#\.[a-zA-Z0-9]+$#', $url ) ) {
+                $id = $wpdb-&gt;get_var( $wpdb-&gt;prepare( &quot;SELECT ID FROM $wpdb-&gt;posts WHERE post_type = 'attachment' &quot; .
+                        &quot;AND guid = %s&quot;, $url ) );
+
+                if ( ! empty( $id ) )
+                        return (int) $id;
+        }
+
+        return 0;
</ins><span class="cx"> }
</span><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>

</body>
</html>