Changeset 22770 for trunk/wp-includes/script-loader.php

Timestamp:

11/21/2012 04:46:32 PM (14 years ago)

Author:

koopersmith

Message:

Media: Move the new sections of media-upload.js to media-editor.js to allow the media modal to be used on the front end and prevent dependency conflicts with older themes and plugins. see #21390.

File:

• trunk/wp-includes/script-loader.php (modified) (2 diffs)

trunk/wp-includes/script-loader.php

@@ -299 +299 @@
         ) );
 
-        $scripts->add( 'media-upload', "/wp-admin/js/media-upload$suffix.js", array( 'thickbox', 'shortcode', 'media-views' ), false, 1 );
+        $scripts->add( 'media-upload', "/wp-admin/js/media-upload$suffix.js", array( 'thickbox', 'shortcode' ), false, 1 );
 
         $scripts->add( 'hoverIntent', "/wp-includes/js/hoverIntent$suffix.js", array('jquery'), 'r6', 1 );
@@ -319 +319 @@
         ) );
 
+        $scripts->add( 'shortcode', "/wp-includes/js/shortcode$suffix.js", array( 'underscore' ), false, 1 );
         $scripts->add( 'media-models', "/wp-includes/js/media-models$suffix.js", array( 'backbone', 'jquery' ), false, 1 );
         did_action( 'init' ) && $scripts->localize( 'media-models', '_wpMediaModelsL10n', array(
-                'saveAttachmentNonce' => wp_create_nonce( 'save-attachment' ),
-        ) );
-
+                'settings' => array(
+                        'saveAttachmentNonce' => wp_create_nonce( 'save-attachment' ),
+                        'ajaxurl' => admin_url( 'admin-ajax.php', 'relative' ),
+                ),
+        ) );
+
+        // To enqueue media-views or media-editor, call wp_enqueue_media().
+        // Both rely on numerous settings, styles, and templates to operate correctly.
         $scripts->add( 'media-views',  "/wp-includes/js/media-views$suffix.js",  array( 'media-models', 'wp-plupload' ), false, 1 );
-        $scripts->add( 'shortcode', "/wp-includes/js/shortcode$suffix.js", array( 'underscore' ), false, 1 );
+        $scripts->add( 'media-editor', "/wp-includes/js/media-editor$suffix.js", array( 'shortcode', 'media-views' ), false, 1 );
         $scripts->add( 'mce-view', "/wp-includes/js/mce-view$suffix.js", array( 'shortcode', 'media-models' ), false, 1 );