Changeset 29577

Timestamp:

08/22/2014 06:54:08 PM (12 years ago)

Author:

azaozz

Message:

TinyMCE wpView: fix showing errors for non-embeddable URLs, no-ssl or no items. Props avryl, fixes #29114, see #29268.

Location:

trunk/src

Files:

• wp-admin/includes/ajax-actions.php (modified) (1 diff)
• wp-includes/js/mce-view.js (modified) (2 diffs)

trunk/src/wp-admin/includes/ajax-actions.php

@@ -2724 +2724 @@
 
         if ( empty( $shortcode ) ) {
-                wp_send_json_error( array( 'statusText' => __( 'No items found.' ) ) );
+                wp_send_json_error( array(
+                        'type' => 'no-items',
+                        'message' => __( 'No items found.' ),
+                ) );
         }
 

trunk/src/wp-includes/js/mce-view.js

@@ -562 +562 @@
                                 if ( this.parsed ) {
                                         this.setIframes( this.parsed );
-                                } else if ( this.parsed === false ) {
-                                        this.setContent( '<p>' + this.original + '</p>', 'replace' );
+                                } else {
+                                        this.fail();
                                 }
                         },
@@ -577 +577 @@
                                         }
                                 } )
-                                .always( function() {
-                                        self.parsed = false;
-                                } )
                                 .done( function( response ) {
                                         if ( response ) {
                                                 self.parsed = response;
                                                 self.setIframes( response );
+                                        } else {
+                                                self.fail( true );
                                         }
                                 } )
                                 .fail( function( response ) {
-                                        if ( response && response.message ) {
-                                                if ( ( response.type === 'not-embeddable' && self.type === 'embed' ) ||
-                                                        response.type === 'not-ssl' ) {
-
-                                                        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' );
-                                        }
+                                        self.fail( response || true );
                                 } );
+                        },
+
+                        fail: function( error ) {
+                                if ( ! this.error ) {
+                                        if ( error ) {
+                                                this.error = error
+                                        } else {
+                                                return;
+                                        }
+                                }
+
+                                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' );
+                                }
                         },