Ticket #40854: 40854.2.diff

src/wp-admin/js/editor.js

@@ -545 +545 @@
         wp.editor.initialize = function( id, settings ) {
                 var init;
                 var defaults;
+                var addMediaButton;
 
                 if ( ! $ || ! id || ! wp.editor.getDefaultSettings ) {
                         return;
@@ -559 +560 @@
                         };
                 }
 
+                if ( settings.mediaButtons ) {
+                        addMediaButton = $( '<button type="button" class="button insert-media add_media">' );
+                        addMediaButton.append( '<span class="wp-media-buttons-icon"></span>' );
+                        addMediaButton.append( document.createTextNode( ' ' + 'Add Media' ) ); // @todo i18n, window.tinymce.translate is not available if ! user_can_richedit().
+                        addMediaButton.data( 'editor', id );
+                }
+
                 // Add wrap and the Visual|Text tabs.
                 if ( settings.tinymce && settings.quicktags ) {
                         var $textarea = $( '#' + id );
+
                         var $wrap = $( '<div>' ).attr( {
                                         'class': 'wp-core-ui wp-editor-wrap tmce-active',
                                         id: 'wp-' + id + '-wrap'
                                 } );
+
                         var $editorContainer = $( '<div class="wp-editor-container">' );
+
                         var $button = $( '<button>' ).attr( {
                                         type: 'button',
                                         'data-wp-editor-id': id
                                 } );
 
+                        var $editorTools = $( '<div class="wp-editor-tools">' );
+
+                        if ( settings.mediaButtons ) {
+                                $editorTools.append(
+                                        $( '<div class="wp-media-buttons">' )
+                                                .append( addMediaButton )
+                                );
+                        }
+
                         $wrap.append(
-                                $( '<div class="wp-editor-tools">' )
+                                $editorTools
                                         .append( $( '<div class="wp-editor-tabs">' )
                                                 .append( $button.clone().attr({
                                                         id: id + '-tmce',

src/wp-admin/js/widgets/text-widgets.js

@@ -230 +230 @@
                                 // The user has disabled TinyMCE.
                                 if ( typeof window.tinymce === 'undefined' ) {
                                         wp.editor.initialize( id, {
-                                                quicktags: true
+                                                quicktags: true,
+                                                mediaButtons: true
                                         });
 
                                         return;
@@ -242 +243 @@
                                         wp.editor.remove( id );
                                 }
 
+                                // Add or enable the `wpview` plugin.
+                                $( document ).one( 'wp-before-tinymce-init.text-widget-init', function( event, init ) {
+                                        // If somebody has removed all plugins, they must have a good reason.
+                                        // Keep it that way.
+                                        if ( ! init.plugins ) {
+                                                return;
+                                        } else if ( ! /\bwpview\b/.test( init.plugins ) ) {
+                                                init.plugins += ',wpview';
+                                        }
+                                } );
+
                                 wp.editor.initialize( id, {
                                         tinymce: {
                                                 wpautop: true
                                         },
-                                        quicktags: true
+                                        quicktags: true,
+                                        mediaButtons: true
                                 });
 
                                 /**