<!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>[32258] trunk/src: Revert editing of video embed parameters in the media modal, [31620] and [31626] for now.</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/32258">32258</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/32258","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>azaozz</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-04-21 22:40:23 +0000 (Tue, 21 Apr 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Revert editing of video embed parameters in the media modal, <a href="https://core.trac.wordpress.org/changeset/31620">[31620]</a> and <a href="https://core.trac.wordpress.org/changeset/31626">[31626]</a> for now. Plan on revisiting in 4.3.
Props iseulde. Fixes <a href="https://core.trac.wordpress.org/ticket/31139">#31139</a>, fixes <a href="https://core.trac.wordpress.org/ticket/32006">#32006</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesajaxactionsphp">trunk/src/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#trunksrcwpincludesclasswpembedphp">trunk/src/wp-includes/class-wp-embed.php</a></li>
<li><a href="#trunksrcwpincludescssmediaviewscss">trunk/src/wp-includes/css/media-views.css</a></li>
<li><a href="#trunksrcwpincludesjsmceviewjs">trunk/src/wp-includes/js/mce-view.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsembedlinkjs">trunk/src/wp-includes/js/media/views/embed/link.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsjs">trunk/src/wp-includes/js/media-views.js</a></li>
<li><a href="#trunksrcwpincludesmediatemplatephp">trunk/src/wp-includes/media-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesajaxactionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/ajax-actions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/ajax-actions.php 2015-04-21 21:31:26 UTC (rev 32257)
+++ trunk/src/wp-admin/includes/ajax-actions.php 2015-04-21 22:40:23 UTC (rev 32258)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2714,21 +2714,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $shortcode = wp_unslash( $_POST['shortcode'] );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $url = str_replace( '[embed]', '', str_replace( '[/embed]', '', $shortcode ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- preg_match( '/' . get_shortcode_regex() . '/s', $shortcode, $matches );
- $atts = shortcode_parse_atts( $matches[3] );
- if ( ! empty( $matches[5] ) ) {
- $url = $matches[5];
- } elseif ( ! empty( $atts['src'] ) ) {
- $url = $atts['src'];
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> $parsed = false;
</span><span class="cx" style="display: block; padding: 0 10px"> setup_postdata( $post );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_embed->return_false_on_fail = true;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_ssl() && 0 === strpos( $url, 'http://' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_ssl() && preg_match( '%^\\[embed[^\\]]*\\]http://%i', $shortcode ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Admin is ssl and the user pasted non-ssl URL.
</span><span class="cx" style="display: block; padding: 0 10px"> // Check if the provider supports ssl embeds and use that for the preview.
</span><span class="cx" style="display: block; padding: 0 10px"> $ssl_shortcode = preg_replace( '%^(\\[embed[^\\]]*\\])http://%i', '$1https://', $shortcode );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2781,8 +2774,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_success( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'body' => $parsed,
- 'attr' => $wp_embed->last_attr
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'body' => $parsed
</ins><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpembedphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-embed.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-embed.php 2015-04-21 21:31:26 UTC (rev 32257)
+++ trunk/src/wp-includes/class-wp-embed.php 2015-04-21 22:40:23 UTC (rev 32258)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,8 +11,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public $post_ID;
</span><span class="cx" style="display: block; padding: 0 10px"> public $usecache = true;
</span><span class="cx" style="display: block; padding: 0 10px"> public $linkifunknown = true;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public $last_attr = array();
- public $last_url = '';
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * When an URL cannot be embedded, return false instead of returning a link
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -136,18 +134,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $url = $attr['src'];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->last_url = $url;
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( $url ) ) {
- $this->last_attr = $attr;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $url ) )
</ins><span class="cx" style="display: block; padding: 0 10px"> return '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- }
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $rawattr = $attr;
</span><span class="cx" style="display: block; padding: 0 10px"> $attr = wp_parse_args( $attr, wp_embed_defaults( $url ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->last_attr = $attr;
-
</del><span class="cx" style="display: block; padding: 0 10px"> // kses converts & into & and we need to undo this
</span><span class="cx" style="display: block; padding: 0 10px"> // See https://core.trac.wordpress.org/ticket/11311
</span><span class="cx" style="display: block; padding: 0 10px"> $url = str_replace( '&', '&', $url );
</span></span></pre></div>
<a id="trunksrcwpincludescssmediaviewscss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/css/media-views.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/css/media-views.css 2015-04-21 21:31:26 UTC (rev 32257)
+++ trunk/src/wp-includes/css/media-views.css 2015-04-21 22:40:23 UTC (rev 32258)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1981,29 +1981,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> clear: both;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.embed-link-settings .setting {
- display: none;
-}
-
-.embed-link-dimensions:after {
- content: '';
- display: block;
- clear: both;
-}
-
-.embed-link-dimensions .width,
-.embed-link-dimensions .height {
- float: left;
- width: 125px;
- clear: none;
- margin-right: 10px;
-}
-
-.embed-link-dimensions input {
- width: auto;
- max-width: 110px;
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> .image-details .embed-media-settings .setting {
</span><span class="cx" style="display: block; padding: 0 10px"> float: none;
</span><span class="cx" style="display: block; padding: 0 10px"> width: auto;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2050,7 +2027,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> .media-embed .setting span {
</span><span class="cx" style="display: block; padding: 0 10px"> display: block;
</span><span class="cx" style="display: block; padding: 0 10px"> width: 200px;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- max-width: 100%;
</del><span class="cx" style="display: block; padding: 0 10px"> font-size: 13px;
</span><span class="cx" style="display: block; padding: 0 10px"> line-height: 24px;
</span><span class="cx" style="display: block; padding: 0 10px"> color: #666;
</span></span></pre></div>
<a id="trunksrcwpincludesjsmceviewjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/mce-view.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/mce-view.js 2015-04-21 21:31:26 UTC (rev 32257)
+++ trunk/src/wp-includes/js/mce-view.js 2015-04-21 22:40:23 UTC (rev 32258)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -818,12 +818,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> edit: function( text, update ) {
</span><span class="cx" style="display: block; padding: 0 10px"> var media = wp.media.embed,
</span><span class="cx" style="display: block; padding: 0 10px"> frame = media.edit( text, this.url ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- self = this,
- events = 'change:url change:width change:height';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self = this;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> this.pausePlayers();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- frame.state( 'embed' ).props.on( events, function( model, url ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ frame.state( 'embed' ).props.on( 'change:url', function( model, url ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( url && model.get( 'url' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> frame.state( 'embed' ).metadata = model.toJSON();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -832,7 +831,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> frame.state( 'embed' ).on( 'select', function() {
</span><span class="cx" style="display: block; padding: 0 10px"> var data = frame.state( 'embed' ).metadata;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( self.url && ! data.width ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( self.url ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> update( data.url );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> update( media.shortcode( data ).string() );
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsembedlinkjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views/embed/link.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/embed/link.js 2015-04-21 21:31:26 UTC (rev 32257)
+++ trunk/src/wp-includes/js/media/views/embed/link.js 2015-04-21 22:40:23 UTC (rev 32258)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,7 +19,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> initialize: function() {
</span><span class="cx" style="display: block; padding: 0 10px"> this.spinner = $('<span class="spinner" />');
</span><span class="cx" style="display: block; padding: 0 10px"> this.$el.append( this.spinner[0] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.listenTo( this.model, 'change:url change:width change:height', this.updateoEmbed );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.listenTo( this.model, 'change:url', this.updateoEmbed );
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> updateoEmbed: _.debounce( function() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -38,23 +38,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }, 600 ),
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> fetch: function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var embed;
-
</del><span class="cx" style="display: block; padding: 0 10px"> // check if they haven't typed in 500 ms
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $('#embed-url-field').val() !== this.model.get('url') ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- embed = new wp.shortcode({
- tag: 'embed',
- attrs: _.pick( this.model.attributes, [ 'width', 'height', 'src' ] ),
- content: this.model.get('url')
- });
-
</del><span class="cx" style="display: block; padding: 0 10px"> wp.ajax.send( 'parse-embed', {
</span><span class="cx" style="display: block; padding: 0 10px"> data : {
</span><span class="cx" style="display: block; padding: 0 10px"> post_ID: wp.media.view.settings.post.id,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- shortcode: embed.string()
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ shortcode: '[embed]' + this.model.get('url') + '[/embed]'
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } )
</span><span class="cx" style="display: block; padding: 0 10px"> .done( _.bind( this.renderoEmbed, this ) )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,38 +54,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> renderFail: function () {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.$( '.setting' ).hide().filter( '.link-text' ).show();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.$( '.link-text' ).show();
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> renderoEmbed: function( response ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var html = ( response && response.body ) || '',
- attr = {},
- opts = { silent: true };
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var html = ( response && response.body ) || '';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.$( '.setting' ).hide()
- .filter( '.link-text' )[ html ? 'hide' : 'show' ]();
-
- if ( response && response.attr ) {
- attr = response.attr;
-
- _.each( [ 'width', 'height' ], function ( key ) {
- var $el = this.$( '.setting.' + key ),
- value = attr[ key ];
-
- if ( value ) {
- this.model.set( key, value, opts );
- $el.show().find( 'input' ).val( value );
- } else {
- this.model.unset( key, opts );
- $el.hide().find( 'input' ).val( '' );
- }
- }, this );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( html ) {
+ this.$('.embed-container').show().find('.embed-preview').html( html );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.model.unset( 'height', opts );
- this.model.unset( 'width', opts );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.renderFail();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- this.$('.embed-container').show().find('.embed-preview').html( html );
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media-views.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media-views.js 2015-04-21 21:31:26 UTC (rev 32257)
+++ trunk/src/wp-includes/js/media-views.js 2015-04-21 22:40:23 UTC (rev 32258)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4535,7 +4535,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> initialize: function() {
</span><span class="cx" style="display: block; padding: 0 10px"> this.spinner = $('<span class="spinner" />');
</span><span class="cx" style="display: block; padding: 0 10px"> this.$el.append( this.spinner[0] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.listenTo( this.model, 'change:url change:width change:height', this.updateoEmbed );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.listenTo( this.model, 'change:url', this.updateoEmbed );
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> updateoEmbed: _.debounce( function() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4554,23 +4554,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }, 600 ),
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> fetch: function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var embed;
-
</del><span class="cx" style="display: block; padding: 0 10px"> // check if they haven't typed in 500 ms
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $('#embed-url-field').val() !== this.model.get('url') ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- embed = new wp.shortcode({
- tag: 'embed',
- attrs: _.pick( this.model.attributes, [ 'width', 'height', 'src' ] ),
- content: this.model.get('url')
- });
-
</del><span class="cx" style="display: block; padding: 0 10px"> wp.ajax.send( 'parse-embed', {
</span><span class="cx" style="display: block; padding: 0 10px"> data : {
</span><span class="cx" style="display: block; padding: 0 10px"> post_ID: wp.media.view.settings.post.id,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- shortcode: embed.string()
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ shortcode: '[embed]' + this.model.get('url') + '[/embed]'
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } )
</span><span class="cx" style="display: block; padding: 0 10px"> .done( _.bind( this.renderoEmbed, this ) )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4578,38 +4570,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> renderFail: function () {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.$( '.setting' ).hide().filter( '.link-text' ).show();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.$( '.link-text' ).show();
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> renderoEmbed: function( response ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var html = ( response && response.body ) || '',
- attr = {},
- opts = { silent: true };
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var html = ( response && response.body ) || '';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.$( '.setting' ).hide()
- .filter( '.link-text' )[ html ? 'hide' : 'show' ]();
-
- if ( response && response.attr ) {
- attr = response.attr;
-
- _.each( [ 'width', 'height' ], function ( key ) {
- var $el = this.$( '.setting.' + key ),
- value = attr[ key ];
-
- if ( value ) {
- this.model.set( key, value, opts );
- $el.show().find( 'input' ).val( value );
- } else {
- this.model.unset( key, opts );
- $el.hide().find( 'input' ).val( '' );
- }
- }, this );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( html ) {
+ this.$('.embed-container').show().find('.embed-preview').html( html );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.model.unset( 'height', opts );
- this.model.unset( 'width', opts );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.renderFail();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- this.$('.embed-container').show().find('.embed-preview').html( html );
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesmediatemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/media-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/media-template.php 2015-04-21 21:31:26 UTC (rev 32257)
+++ trunk/src/wp-includes/media-template.php 2015-04-21 22:40:23 UTC (rev 32258)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -819,16 +819,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="embed-container" style="display: none;">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="embed-preview"></div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="embed-link-dimensions">
- <label class="setting width">
- <span><?php _e( 'Maximum Width' ); ?></span>
- <input type="text" class="alignment" data-setting="width" />
- </label>
- <label class="setting height">
- <span><?php _e( 'Maximum Height' ); ?></span>
- <input type="text" class="alignment" data-setting="height" />
- </label>
- </div>
</del><span class="cx" style="display: block; padding: 0 10px"> </script>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <script type="text/html" id="tmpl-embed-image-settings">
</span></span></pre>
</div>
</div>
</body>
</html>