<!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>[28581] trunk/src: When adding a URL in the `Insert from URL` state in the media modal, attempt to show a preview of the content.</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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/28581">28581</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-05-26 23:56:27 +0000 (Mon, 26 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>When adding a URL in the `Insert from URL` state in the media modal, attempt to show a preview of the content. Drop the unused width and height fields.
This will probably be iterated upon.
Props helen, jtsternberg, wonderboymusic.
See <a href="http://core.trac.wordpress.org/ticket/15490">#15490</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesajaxactionsphp">trunk/src/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#trunksrcwpincludescssmediaviewscss">trunk/src/wp-includes/css/media-views.css</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>Modified: trunk/src/wp-admin/includes/ajax-actions.php (28580 => 28581)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/ajax-actions.php 2014-05-26 23:42:08 UTC (rev 28580)
+++ trunk/src/wp-admin/includes/ajax-actions.php 2014-05-26 23:56:27 UTC (rev 28581)
</span><span class="lines">@@ -2309,6 +2309,8 @@
</span><span class="cx"> * @since 3.5.0
</span><span class="cx"> */
</span><span class="cx"> function wp_ajax_send_link_to_editor() {
</span><ins>+ global $post, $wp_embed;
+
</ins><span class="cx"> check_ajax_referer( 'media-send-to-editor', 'nonce' );
</span><span class="cx">
</span><span class="cx"> if ( ! $src = wp_unslash( $_POST['src'] ) )
</span><span class="lines">@@ -2323,9 +2325,20 @@
</span><span class="cx"> if ( ! $title = trim( wp_unslash( $_POST['title'] ) ) )
</span><span class="cx"> $title = wp_basename( $src );
</span><span class="cx">
</span><del>- $html = '';
- if ( $title )
</del><ins>+ $post = get_post( isset( $_POST['post_id'] ) ? $_POST['post_id'] : 0 );
+ // ping WordPress for an embed
+ $check_embed = $wp_embed->run_shortcode( '[embed]'. $src .'[/embed]' );
+ // fallback that WordPress creates when no oEmbed was found
+ $fallback = $wp_embed->maybe_make_link( $src );
+
+ if ( $check_embed !== $fallback ) {
+ // TinyMCE view for [embed] will parse this
+ $html = '[embed]' . $src . '[/embed]';
+ } elseif ( $title ) {
</ins><span class="cx"> $html = '<a href="' . esc_url( $src ) . '">' . $title . '</a>';
</span><ins>+ } else {
+ $html = '';
+ }
</ins><span class="cx">
</span><span class="cx"> // Figure out what filter to run:
</span><span class="cx"> $type = 'file';
</span></span></pre></div>
<a id="trunksrcwpincludescssmediaviewscss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/css/media-views.css (28580 => 28581)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/css/media-views.css 2014-05-26 23:42:08 UTC (rev 28580)
+++ trunk/src/wp-includes/css/media-views.css 2014-05-26 23:56:27 UTC (rev 28581)
</span><span class="lines">@@ -1583,7 +1583,7 @@
</span><span class="cx">
</span><span class="cx"> .media-frame .embed-url .spinner {
</span><span class="cx"> position: absolute;
</span><del>- top: 16px;
</del><ins>+ top: 32px;
</ins><span class="cx"> right: 26px;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1594,7 +1594,7 @@
</span><span class="cx"> .embed-link-settings,
</span><span class="cx"> .embed-media-settings {
</span><span class="cx"> position: absolute;
</span><del>- top: 60px;
</del><ins>+ top: 70px;
</ins><span class="cx"> left: 0;
</span><span class="cx"> right: 0;
</span><span class="cx"> bottom: 0;
</span><span class="lines">@@ -1602,6 +1602,14 @@
</span><span class="cx"> overflow: auto;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.embed-preview img, .embed-preview iframe, .embed-preview embed {
+ max-width: 100%;
+}
+
+.embed-preview img {
+ height: auto;
+}
+
</ins><span class="cx"> .image-details .media-modal {
</span><span class="cx"> left: 140px;
</span><span class="cx"> right: 140px;
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/media-views.js (28580 => 28581)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/media-views.js 2014-05-26 23:42:08 UTC (rev 28580)
+++ trunk/src/wp-includes/js/media-views.js 2014-05-26 23:56:27 UTC (rev 28581)
</span><span class="lines">@@ -6150,7 +6150,7 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> initialize: function() {
</span><del>- this.$input = $('<input/>').attr( 'type', 'text' ).val( this.model.get('url') );
</del><ins>+ this.$input = $('<input id="embed-url-field" />').attr( 'type', 'text' ).val( this.model.get('url') );
</ins><span class="cx"> this.input = this.$input[0];
</span><span class="cx">
</span><span class="cx"> this.spinner = $('<span class="spinner" />')[0];
</span><span class="lines">@@ -6206,7 +6206,51 @@
</span><span class="cx"> */
</span><span class="cx"> media.view.EmbedLink = media.view.Settings.extend({
</span><span class="cx"> className: 'embed-link-settings',
</span><del>- template: media.template('embed-link-settings')
</del><ins>+ template: media.template('embed-link-settings'),
+
+ initialize: function() {
+ this.spinner = $('<span class="spinner" />');
+ this.$el.append( this.spinner[0] );
+ this.listenTo( this.model, 'change:url', this.updateoEmbed );
+ },
+
+ updateoEmbed: function() {
+ var url = this.model.get( 'url' );
+
+ this.$('.setting.title').show();
+ // clear out previous results
+ this.$('.embed-container').hide().find('.embed-preview').html('');
+
+ // only proceed with embed if the field contains more than 6 characters
+ if ( url && url.length < 6 ) {
+ return;
+ }
+
+ this.spinner.show();
+
+ setTimeout( _.bind( this.fetch, this ), 500 );
+ },
+
+ fetch: function() {
+ // check if they haven't typed in 500 ms
+ if ( $('#embed-url-field').val() !== this.model.get('url') ) {
+ return;
+ }
+
+ wp.ajax.send( 'parse-embed', {
+ data : {
+ post_ID: media.view.settings.post.id,
+ content: '[embed]' + this.model.get('url') + '[/embed]'
+ }
+ } ).done( _.bind( this.renderoEmbed, this ) );
+ },
+
+ renderoEmbed: function(html) {
+ this.spinner.hide();
+
+ this.$('.setting.title').hide();
+ this.$('.embed-container').show().find('.embed-preview').html( html );
+ }
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunksrcwpincludesmediatemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/media-template.php (28580 => 28581)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/media-template.php 2014-05-26 23:42:08 UTC (rev 28580)
+++ trunk/src/wp-includes/media-template.php 2014-05-26 23:56:27 UTC (rev 28581)
</span><span class="lines">@@ -546,10 +546,13 @@
</span><span class="cx"> </script>
</span><span class="cx">
</span><span class="cx"> <script type="text/html" id="tmpl-embed-link-settings">
</span><del>- <label class="setting">
- <span><?php _e('Title'); ?></span>
</del><ins>+ <label class="setting title">
+ <span><?php _e( 'Title' ); ?></span>
</ins><span class="cx"> <input type="text" class="alignment" data-setting="title" />
</span><span class="cx"> </label>
</span><ins>+ <div class="embed-container" style="display: none;">
+ <div class="embed-preview"></div>
+ </div>
</ins><span class="cx"> </script>
</span><span class="cx">
</span><span class="cx"> <script type="text/html" id="tmpl-embed-image-settings">
</span></span></pre>
</div>
</div>
</body>
</html>