<!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>[29577] trunk/src: TinyMCE wpView: fix showing errors for non-embeddable URLs, no-ssl or no items.</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/29577">29577</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2014-08-22 18:54:08 +0000 (Fri, 22 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>TinyMCE wpView: fix showing errors for non-embeddable URLs, no-ssl or no items. Props avryl, fixes <a href="http://core.trac.wordpress.org/ticket/29114">#29114</a>, see <a href="http://core.trac.wordpress.org/ticket/29268">#29268</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesajaxactionsphp">trunk/src/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#trunksrcwpincludesjsmceviewjs">trunk/src/wp-includes/js/mce-view.js</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 (29576 => 29577)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/ajax-actions.php 2014-08-22 17:43:39 UTC (rev 29576)
+++ trunk/src/wp-admin/includes/ajax-actions.php 2014-08-22 18:54:08 UTC (rev 29577)
</span><span class="lines">@@ -2723,7 +2723,10 @@
</span><span class="cx"> $shortcode = do_shortcode( wp_unslash( $_REQUEST['shortcode'] ) );
</span><span class="cx">
</span><span class="cx"> if ( empty( $shortcode ) ) {
</span><del>- wp_send_json_error( array( 'statusText' => __( 'No items found.' ) ) );
</del><ins>+ wp_send_json_error( array(
+ 'type' => 'no-items',
+ 'message' => __( 'No items found.' ),
+ ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ob_start();
</span></span></pre></div>
<a id="trunksrcwpincludesjsmceviewjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/mce-view.js (29576 => 29577)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/mce-view.js 2014-08-22 17:43:39 UTC (rev 29576)
+++ trunk/src/wp-includes/js/mce-view.js 2014-08-22 18:54:08 UTC (rev 29577)
</span><span class="lines">@@ -561,8 +561,8 @@
</span><span class="cx"> setNodes: function () {
</span><span class="cx"> if ( this.parsed ) {
</span><span class="cx"> this.setIframes( this.parsed );
</span><del>- } else if ( this.parsed === false ) {
- this.setContent( '<p>' + this.original + '</p>', 'replace' );
</del><ins>+ } else {
+ this.fail();
</ins><span class="cx"> }
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -576,28 +576,41 @@
</span><span class="cx"> shortcode: this.shortcode.string()
</span><span class="cx"> }
</span><span class="cx"> } )
</span><del>- .always( function() {
- self.parsed = false;
- } )
</del><span class="cx"> .done( function( response ) {
</span><span class="cx"> if ( response ) {
</span><span class="cx"> self.parsed = response;
</span><span class="cx"> self.setIframes( response );
</span><ins>+ } else {
+ self.fail( true );
</ins><span class="cx"> }
</span><span class="cx"> } )
</span><span class="cx"> .fail( function( response ) {
</span><del>- if ( response && response.message ) {
- if ( ( response.type === 'not-embeddable' && self.type === 'embed' ) ||
- response.type === 'not-ssl' ) {
</del><ins>+ self.fail( response || true );
+ } );
+ },
</ins><span class="cx">
</span><del>- self.setError( response.message, 'admin-media' );
- } else {
- self.setContent( '<p>' + self.original + '</p>', 'replace' );
- }
- } else if ( response && response.statusText ) {
- self.setError( response.statusText, 'admin-media' );
</del><ins>+ fail: function( error ) {
+ if ( ! this.error ) {
+ if ( error ) {
+ this.error = error
+ } else {
+ return;
</ins><span class="cx"> }
</span><del>- } );
</del><ins>+ }
+
+ if ( this.error.message ) {
+ if ( ( this.error.type === 'not-embeddable' && this.type === 'embed' ) || this.error.type === 'not-ssl' ||
+ this.error.type === 'no-items' ) {
+
+ this.setError( this.error.message, 'admin-media' );
+ } else {
+ this.setContent( '<p>' + this.original + '</p>', 'replace' );
+ }
+ } else if ( this.error.statusText ) {
+ this.setError( this.error.statusText, 'admin-media' );
+ } else if ( this.original ) {
+ this.setContent( '<p>' + this.original + '</p>', 'replace' );
+ }
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> stopPlayers: function( remove ) {
</span></span></pre>
</div>
</div>
</body>
</html>