diff --git wp-admin/css/wp-admin.dev.css wp-admin/css/wp-admin.dev.css index 3b9dca7..c675425 100644 --- wp-admin/css/wp-admin.dev.css +++ wp-admin/css/wp-admin.dev.css @@ -3724,7 +3724,8 @@ abbr.required { } .media-item .describe input[type="text"], -.media-item .describe textarea { +.media-item .describe textarea, +.media-item .wp-editor-wrap { width: 460px; } @@ -3906,10 +3907,6 @@ abbr.required { border-radius: 3px; } -.media-item .post_excerpt textarea { - height: 60px; -} - /*------------------------------------------------------------------------------ 14.1 - Media Library ------------------------------------------------------------------------------*/ diff --git wp-admin/includes/media.php wp-admin/includes/media.php index 0ae2f10..9b35a8e 100644 --- wp-admin/includes/media.php +++ wp-admin/includes/media.php @@ -788,25 +788,38 @@ function image_link_input_fields($post, $url_type = '') { "; } +/** + * Render an editor for image caption + * + * @see `get_attachment_fields_to_edit()` + * @since 3.4 + * + * @param Object $edit_post, media item object + * @return String, the generated html + */ function wp_caption_input_textarea($edit_post) { // post data is already escaped $name = "attachments[{$edit_post->ID}][post_excerpt]"; - - return ' - -
- '; + $defaults = array( + 'teeny' => true, + 'tinymce' => false, + 'media_buttons' => false, + 'textarea_rows' => 10, + 'quicktags' => array( + 'buttons' => 'strong,em,link,del,ins,code,close' + ) + ); + $settings = apply_filters( 'caption_input_textarea', $defaults, $edit_post ); + + // Do not load wpLink if tinymce is not present + // Just plain Quicktags link handler + if ( !$settings['tinymce'] ) + wp_deregister_script('wplink'); + + // Use a buffer to get the output, otherway it will just echo everything + ob_start(); + wp_editor( $edit_post->post_excerpt, $name, $settings ); + return ob_get_clean(); } /** diff --git wp-includes/js/tinymce/langs/wp-langs-en.js wp-includes/js/tinymce/langs/wp-langs-en.js index 6921eab..53d784a 100644 --- wp-includes/js/tinymce/langs/wp-langs-en.js +++ wp-includes/js/tinymce/langs/wp-langs-en.js @@ -499,7 +499,5 @@ s120:"120%", s130:"130%", img_title:"Title", caption:"Caption", -insert_link:"Insert link", -linked_text:"Linked text", alt:"Alternate Text" }); diff --git wp-includes/js/tinymce/langs/wp-langs.php wp-includes/js/tinymce/langs/wp-langs.php index 625ef75..6100383 100644 --- wp-includes/js/tinymce/langs/wp-langs.php +++ wp-includes/js/tinymce/langs/wp-langs.php @@ -542,8 +542,6 @@ function wp_mce_translation() { 's130' => __('130%'), 'img_title' => __('Title'), 'caption' => __('Caption'), - 'insert_link' => __('Insert link'), - 'linked_text' => __('Linked text'), 'alt' => __('Alternate Text') ); diff --git wp-includes/js/tinymce/plugins/wpeditimage/editimage.html wp-includes/js/tinymce/plugins/wpeditimage/editimage.html index 6437801..bddd108 100644 --- wp-includes/js/tinymce/plugins/wpeditimage/editimage.html +++ wp-includes/js/tinymce/plugins/wpeditimage/editimage.html @@ -7,6 +7,12 @@ + +