Ticket #40854: 40854.0.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 );
@@ -586 +594 @@
                                         ).append( $editorContainer )
                         );
 
+                        if ( settings.mediaButtons ) {
+                                $wrap.find( '.wp-editor-tools' ).prepend(
+                                        $( '<div class="wp-media-buttons">' )
+                                                .append( addMediaButton )
+                                );
+                        }
+
                         $textarea.after( $wrap );
                         $editorContainer.append( $textarea );
                 }

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;
@@ -246 +247 @@
                                         tinymce: {
                                                 wpautop: true
                                         },
-                                        quicktags: true
+                                        quicktags: true,
+                                        mediaButtons: true
                                 });
 
                                 /**