WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add QuickPress support for new media workflow. 

* Adds the code required to include the new media scripts, styles, and settings to `media_button()`.
* Improves script dependencies, namely making `media-upload` require `media-views`.
* Some CSS tweaks for the making the new button work well with QuickPress.

see #21390, fixes #22021.


git-svn-id: http://core.svn.wordpress.org/trunk@22072 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Daryl Koopersmith 2012-09-27 20:04:34 +00:00
parent 8c36f67e11
commit 0c42e6121a
5 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/css/wp-admin.css
View File

@ -6216,7 +6216,7 @@ h3:hover .edit-box {
} }
#dashboard_quick_press .wp-media-buttons { #dashboard_quick_press .wp-media-buttons {
margin: 0 0 .2em 8px; margin: 0 0 .2em 1px;
padding: 0; padding: 0;
} }

4
wp-admin/edit-form-advanced.php
View File

@ -17,13 +17,11 @@ if ( wp_is_mobile() )
if ( post_type_supports($post_type, 'editor') || post_type_supports($post_type, 'thumbnail') ) { if ( post_type_supports($post_type, 'editor') || post_type_supports($post_type, 'thumbnail') ) {
add_thickbox(); add_thickbox();
wp_enqueue_script( 'media-upload' ); wp_enqueue_script( 'media-upload' );
wp_enqueue_script( 'media-views' );
wp_enqueue_style( 'media-views' ); wp_enqueue_style( 'media-views' );
wp_plupload_default_settings(); wp_plupload_default_settings();
add_action( 'admin_footer', 'wp_print_media_templates' ); add_action( 'admin_footer', 'wp_print_media_templates' );
wp_enqueue_script( 'mce-view' );
} }
/** /**

5
wp-admin/includes/media.php
View File

@ -377,6 +377,11 @@ document.body.className = document.body.className.replace('no-js', 'js');
* @param string $editor_id * @param string $editor_id
*/ */
function media_buttons($editor_id = 'content') { function media_buttons($editor_id = 'content') {
wp_enqueue_script( 'media-upload' );
wp_enqueue_style( 'media-views' );
wp_plupload_default_settings();
add_action( 'admin_footer', 'wp_print_media_templates' );
$context = apply_filters('media_buttons_context', __('Upload/Insert %s')); $context = apply_filters('media_buttons_context', __('Upload/Insert %s'));
$img = '<img src="' . esc_url( admin_url( 'images/media-button.png?ver=20111005' ) ) . '" width="16" height="16" />'; $img = '<img src="' . esc_url( admin_url( 'images/media-button.png?ver=20111005' ) ) . '" width="16" height="16" />';

2
wp-admin/js/media-upload.js
View File

@ -148,5 +148,5 @@ var tb_position;
} }
}; };
$( wp.mce.media.init ) $( wp.mce.media.init );
}(jQuery)); }(jQuery));

2
wp-includes/script-loader.php
View File

@ -297,7 +297,7 @@ function wp_default_scripts( &$scripts ) {
'type' => 'characters' == _x( 'words', 'word count: words or characters?' ) ? 'c' : 'w', 'type' => 'characters' == _x( 'words', 'word count: words or characters?' ) ? 'c' : 'w',
) ); ) );
$scripts->add( 'media-upload', "/wp-admin/js/media-upload$suffix.js", array( 'thickbox', 'mce-view' ), false, 1 ); $scripts->add( 'media-upload', "/wp-admin/js/media-upload$suffix.js", array( 'thickbox', 'mce-view', 'media-views' ), false, 1 );
$scripts->add( 'hoverIntent', "/wp-includes/js/hoverIntent$suffix.js", array('jquery'), 'r6', 1 ); $scripts->add( 'hoverIntent', "/wp-includes/js/hoverIntent$suffix.js", array('jquery'), 'r6', 1 );