From 2189575bebf406adc55a29a26c58b1a8a717946d Mon Sep 17 00:00:00 2001 From: Daryl Koopersmith Date: Fri, 9 Nov 2012 04:57:25 +0000 Subject: [PATCH] Media: Add wp_enqueue_media to easily include all media dependencies. Also, media templates now print on `wp_footer`. props sushkov. fixes #22060, see #21390. git-svn-id: https://develop.svn.wordpress.org/trunk@22489 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-admin/edit-form-advanced.php | 5 ----- wp-admin/includes/media.php | 5 +---- wp-includes/media.php | 14 ++++++++++++++ 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php index e72881bc80..08c1fe8933 100644 --- a/wp-admin/edit-form-advanced.php +++ b/wp-admin/edit-form-advanced.php @@ -17,11 +17,6 @@ if ( wp_is_mobile() ) if ( post_type_supports($post_type, 'editor') || post_type_supports($post_type, 'thumbnail') ) { add_thickbox(); - - wp_enqueue_script( 'media-upload' ); - wp_enqueue_style( 'media-views' ); - wp_plupload_default_settings(); - add_action( 'admin_footer', 'wp_print_media_templates' ); } /** diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php index edc736c80b..8516fa56c2 100644 --- a/wp-admin/includes/media.php +++ b/wp-admin/includes/media.php @@ -383,10 +383,7 @@ document.body.className = document.body.className.replace('no-js', 'js'); * @param string $editor_id */ 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' ); + wp_enqueue_media(); $context = apply_filters('media_buttons_context', __('Upload/Insert %s')); diff --git a/wp-includes/media.php b/wp-includes/media.php index 89254daea3..8a1bf41009 100644 --- a/wp-includes/media.php +++ b/wp-includes/media.php @@ -1290,6 +1290,20 @@ function wp_prepare_attachment_for_js( $attachment ) { return apply_filters( 'wp_prepare_attachment_for_js', $response, $attachment, $meta ); } +/** + * Enqueues all scripts, styles, settings, and templates necessary to use + * all media JS APIs. + * + * @since 3.5.0 + */ +function wp_enqueue_media() { + wp_enqueue_script( 'media-upload' ); + wp_enqueue_style( 'media-views' ); + wp_plupload_default_settings(); + add_action( 'admin_footer', 'wp_print_media_templates' ); + add_action( 'wp_footer', 'wp_print_media_templates' ); +} + /** * Prints the templates used in the media manager. *