Changeset 31620 for trunk/src/wp-admin/includes/ajax-actions.php

Timestamp:

03/05/2015 05:59:10 AM (10 years ago)

Author:

wonderboymusic

Message:

Allow inline editing of width and height parameters while previewing an embed in the media modal:

• Use wp.shortcode() instead of manually constructing a shortcode in views/embed/link
• Allow a URL to transition to a shortcode (and vice versa) when returning an embed to TinyMCE
• In WP_Embed, store the last URL and last set of attributes requested in class properties
• wp_ajax_parse_embed(), allow [embed]s to have attributes. Return attr in the response.

This is a first pass to allow broad testing with recent MCE view changes.

See #31139.

File:

• trunk/src/wp-admin/includes/ajax-actions.php (modified) (3 diffs)

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

@@ -2709 +2709 @@
 
     $shortcode = wp_unslash( $_POST['shortcode'] );
-    $url = str_replace( '[embed]', '', str_replace( '[/embed]', '', $shortcode ) );
+
+    preg_match( '/' . get_shortcode_regex() . '/s', $shortcode, $matches );
+    $atts = shortcode_parse_atts( $matches[3] );
+    if ( ! empty( $atts[5] ) ) {
+        $url = $atts[5];
+    } elseif ( ! empty( $atts['src'] ) ) {
+        $url = $atts['src'];
+    }
+
     $parsed = false;
     setup_postdata( $post );
@@ -2715 +2723 @@
     $wp_embed->return_false_on_fail = true;
 
-    if ( is_ssl() && preg_match( '%^\\[embed[^\\]]*\\]http://%i', $shortcode ) ) {
+    if ( is_ssl() && 0 === strpos( $url, 'http://' ) ) {
         // Admin is ssl and the user pasted non-ssl URL.
         // Check if the provider supports ssl embeds and use that for the preview.
@@ -2768 +2776 @@
 
     wp_send_json_success( array(
-        'body' => $parsed
+        'body' => $parsed,
+        'attr' => $wp_embed->last_attr
     ) );
 }