Changeset 28358

Timestamp:

05/10/2014 11:35:08 PM (12 years ago)

Author:

wonderboymusic

Message:

First pass at wpview logic for the [embed] shortcode. URLs on a their own line are parsed as well. The toolbar will appear with the "remove" button when the view is clicked. Edit has not been implemented yet.

Props avryl, wonderboymusic.
See #28195.

Location:

trunk/src

Files:

• wp-admin/admin-ajax.php (modified) (1 diff)
• wp-admin/includes/ajax-actions.php (modified) (1 diff)
• wp-includes/js/mce-view.js (modified) (2 diffs)
• wp-includes/js/media-audiovideo.js (modified) (1 diff)
• wp-includes/js/tinymce/plugins/wpview/plugin.js (modified) (1 diff)
• wp-includes/media-template.php (modified) (1 diff)

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

@@ -59 +59 @@
         'query-attachments', 'save-attachment', 'save-attachment-compat', 'send-link-to-editor',
         'send-attachment-to-editor', 'save-attachment-order', 'heartbeat', 'get-revision-diffs',
-        'save-user-color-scheme', 'update-widget', 'query-themes',
+        'save-user-color-scheme', 'update-widget', 'query-themes', 'filter-content'
 );
 

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

@@ -2507 +2507 @@
         wp_send_json_success( $api );
 }
+
+/**
+ * Apply `the_content` filters to a string based on the post ID.
+ *
+ * @since 4.0.0
+ */
+function wp_ajax_filter_content() {
+        global $post;
+
+        if ( ! $post = get_post( (int) $_REQUEST['post_ID'] ) ) {
+                wp_send_json_error();
+        }
+
+        if ( ! current_user_can( 'read_post', $post->ID ) ) {
+                wp_send_json_error();
+        }
+
+        setup_postdata( $post );
+
+        wp_send_json_success( apply_filters( 'the_content', wp_unslash( $_POST['content'] ) ) );
+}

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

@@ -355 +355 @@
         wp.mce.media = {
                 loaded: false,
-                /**
-                 * @global wp.shortcode
-                 *
-                 * @param {string} content
-                 * @returns {Object}
-                 */
-                toView:  function( content ) {
-                        var match = wp.shortcode.next( this.shortcode, content );
-
-                        if ( ! match ) {
-                                return;
-                        }
-
-                        return {
-                                index:   match.index,
-                                content: match.content,
-                                options: {
-                                        shortcode: match.shortcode
-                                }
-                        };
-                },
+                toView: wp.mce.gallery.toView,
 
                 /**
@@ -691 +671 @@
         } );
         wp.mce.views.register( 'playlist', wp.mce.playlist );
+
+        wp.mce.embed = {
+                shortcode: 'embed',
+                toView: wp.mce.gallery.toView,
+                View: wp.mce.View.extend( {
+                        className: 'editor-embed',
+                        template: media.template( 'editor-embed' ),
+                        initialize: function( options ) {
+                                this.players = [];
+                                this.content = options.content;
+                                this.parsed = false;
+                                this.shortcode = options.shortcode;
+                                _.bindAll( this, 'setHtml', 'setNode', 'fetch' );
+                                $( this ).on( 'ready', this.setNode );
+                        },
+                        unbind: function() {
+                                var self = this;
+                                this.pauseAllPlayers();
+                                _.each( this.players, function ( player ) {
+                                        self.removePlayer( player );
+                                } );
+                                this.players = [];
+                        },
+                        setNode: function ( e, node ) {
+                                this.node = node;
+                                if ( this.parsed ) {
+                                        this.parseMediaShortcodes();
+                                } else {
+                                        this.fetch();
+                                }
+                        },
+                        fetch: function () {
+                                wp.ajax.send( 'filter-content', {
+                                        data: {
+                                                post_ID: $( '#post_ID' ).val(),
+                                                content: this.shortcode.string()
+                                        }
+                                } ).done( this.setHtml );
+                        },
+                        setHtml: function ( content ) {
+                                var scripts = $( content ).find( 'script' );
+
+                                this.parsed = content;
+
+                                $( this.node ).html( this.getHtml() );
+                                if ( scripts ) {
+                                        _.each( scripts, function (script) {
+                                                var element = document.createElement( 'script' );
+                                                element.type = 'text/javascript';
+                                                element.src = script.src;
+                                                tinymce.activeEditor.contentDocument.getElementsByTagName( 'head' )[0].appendChild( element );
+                                        } );
+                                }
+                                this.parseMediaShortcodes();
+                        },
+                        parseMediaShortcodes: function () {
+                                var self = this;
+                                $( '.wp-audio-shortcode, .wp-video-shortcode', this.node ).each( function ( i, element ) {
+                                        self.players.push( new MediaElementPlayer( element, self.mejsSettings ) );
+                                } );
+                        },
+                        getHtml: function() {
+                                if ( ! this.parsed ) {
+                                        return '';
+                                }
+                                return this.template({ content: this.parsed });
+                        }
+                } ),
+                edit: function() {}
+        };
+
+        _.extend( wp.mce.embed.View.prototype, wp.media.mixin );
+
+        wp.mce.views.register( 'embed', wp.mce.embed );
+
 }(jQuery));

trunk/src/wp-includes/js/media-audiovideo.js

@@ -132 +132 @@
                         var featureIndex, feature;
 
+                        if ( ! t.options ) {
+                                return;
+                        }
+
                         // invoke features cleanup
                         for ( featureIndex in t.options.features ) {

trunk/src/wp-includes/js/tinymce/plugins/wpview/plugin.js

@@ -168 +168 @@
                 event.content = wp.mce.views.toViews( event.content );
         });
+
+        editor.on( 'PastePreProcess', function( event ) {
+                if ( event.content.match( /^\s*(https?:\/\/[^\s"]+)\s*$/im ) ) {
+                        event.content = '[embed]' + event.content + '[/embed]';
+                }
+        } );
 
         // When the editor's content has been updated and the DOM has been

trunk/src/wp-includes/media-template.php

@@ -1046 +1046 @@
         </script>
 
+        <script type="text/html" id="tmpl-editor-embed">
+                <div class="toolbar">
+                        <div class="dashicons dashicons-no-alt remove"></div>
+                </div>
+                {{{ data.content }}}
+                <div class="wpview-overlay"></div>
+        </script>
+
         <?php