<!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>[28754] trunk/src: wpView: improve handling of embed errors/error messages, see #28195</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/28754">28754</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2014-06-15 22:52:45 +0000 (Sun, 15 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>wpView: improve handling of embed errors/error messages, see <a href="http://core.trac.wordpress.org/ticket/28195">#28195</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesajaxactionsphp">trunk/src/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#trunksrcwpadminincludesmiscphp">trunk/src/wp-admin/includes/misc.php</a></li>
<li><a href="#trunksrcwpincludesjsmceviewjs">trunk/src/wp-includes/js/mce-view.js</a></li>
<li><a href="#trunksrcwpincludesjstinymceskinswordpresswpcontentcss">trunk/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css</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 (28753 => 28754)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/ajax-actions.php 2014-06-14 14:56:21 UTC (rev 28753)
+++ trunk/src/wp-admin/includes/ajax-actions.php 2014-06-15 22:52:45 UTC (rev 28754)
</span><span class="lines">@@ -2530,13 +2530,16 @@
</span><span class="cx"> wp_send_json_error();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( ! current_user_can( 'read_post', $post->ID ) ) {
</del><ins>+ if ( empty( $_POST['shortcode'] ) || ! current_user_can( 'read_post', $post->ID ) ) {
</ins><span class="cx"> wp_send_json_error();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> setup_postdata( $post );
</span><span class="cx">
</span><del>- $parsed = $wp_embed->run_shortcode( $_POST['content'] );
</del><ins>+ // If the URL cannot be embedded, return an eror message with wp_send_json_error()
+ add_filter( 'embed_maybe_make_link', '_wpview_embed_error', 20, 2 );
+
+ $parsed = $wp_embed->run_shortcode( $_POST['shortcode'] );
</ins><span class="cx"> $parsed = do_shortcode( $parsed );
</span><span class="cx">
</span><span class="cx"> wp_send_json_success( $parsed );
</span></span></pre></div>
<a id="trunksrcwpadminincludesmiscphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/misc.php (28753 => 28754)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/misc.php 2014-06-14 14:56:21 UTC (rev 28753)
+++ trunk/src/wp-admin/includes/misc.php 2014-06-15 22:52:45 UTC (rev 28754)
</span><span class="lines">@@ -824,3 +824,15 @@
</span><span class="cx"> }
</span><span class="cx"> // Run later as we have to set DOING_AUTOSAVE for back-compat
</span><span class="cx"> add_filter( 'heartbeat_received', 'heartbeat_autosave', 500, 2 );
</span><ins>+
+/**
+ * Send error message when an URL cannot be embedded. Used in wp_ajax_parse_embed().
+ *
+ * @access private
+ * @since 4.0
+ */
+function _wpview_embed_error( $output, $url ) {
+ wp_send_json_error( array(
+ 'message' => sprintf( __( '%s failed to embed.' ), esc_url( $url ) ),
+ ) );
+}
</ins></span></pre></div>
<a id="trunksrcwpincludesjsmceviewjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/mce-view.js (28753 => 28754)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/mce-view.js 2014-06-14 14:56:21 UTC (rev 28753)
+++ trunk/src/wp-includes/js/mce-view.js 2014-06-15 22:52:45 UTC (rev 28754)
</span><span class="lines">@@ -718,27 +718,29 @@
</span><span class="cx">
</span><span class="cx"> wp.ajax.send( 'parse-embed', {
</span><span class="cx"> data: {
</span><del>- post_ID: $( '#post_ID' ).val(),
- content: this.shortcode
</del><ins>+ post_ID: $( '#post_ID' ).val() || 0,
+ shortcode: this.shortcode
</ins><span class="cx"> }
</span><span class="cx"> } )
</span><del>- .done( function( content ) {
</del><ins>+ .always( function() {
</ins><span class="cx"> self.fetching = false;
</span><del>-
- if ( content.substring( 0, ( '<a href' ).length ) === '<a href' ) {
</del><ins>+ } )
+ .done( function( response ) {
+ if ( response ) {
+ self.parsed = response;
+ self.setHtml( response );
+ }
+ } )
+ .fail( function( response ) {
+ if ( response && response.message ) {
</ins><span class="cx"> if ( self.type === 'embed' ) {
</span><del>- self.setError( self.original + ' failed to embed.', 'admin-media' );
</del><ins>+ self.setError( response.message, 'admin-media' );
</ins><span class="cx"> } else {
</span><del>- self.setContent( self.original, null, true );
</del><ins>+ self.setContent( '<p>' + self.original + '</p>', null, true );
</ins><span class="cx"> }
</span><del>- } else {
- self.parsed = content;
- self.setHtml( content );
</del><ins>+ } else if ( response && response.statusText ) {
+ self.setError( response.statusText, 'admin-media' );
</ins><span class="cx"> }
</span><del>- } )
- .fail( function() {
- self.fetching = false;
- self.setError( self.original + ' failed to embed due to a server error.', 'admin-media' );
</del><span class="cx"> } );
</span><span class="cx"> },
</span><span class="cx"> /* jshint scripturl: true */
</span></span></pre></div>
<a id="trunksrcwpincludesjstinymceskinswordpresswpcontentcss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css (28753 => 28754)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css 2014-06-14 14:56:21 UTC (rev 28753)
+++ trunk/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css 2014-06-15 22:52:45 UTC (rev 28754)
</span><span class="lines">@@ -306,8 +306,9 @@
</span><span class="cx">
</span><span class="cx"> .wpview-error {
</span><span class="cx"> border: 1px solid #dedede;
</span><del>- padding: 20px 0;
</del><ins>+ padding: 1em 0;
</ins><span class="cx"> margin: 0;
</span><ins>+ word-wrap: break-word;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .wpview-wrap[data-mce-selected] .wpview-error {
</span></span></pre>
</div>
</div>
</body>
</html>