Changeset 32125

Timestamp:

04/14/2015 03:30:16 PM (12 years ago)

Author:

wonderboymusic

Message:

Move the built media JS files up a directory to their previous location and naming convention. This fidgets with part of [31373] and will maintain BC for those who were loading those files directly (not using the enqueue system).

Props iseulde, ocean90.
Fixes #31912.

Location:

trunk

Files:

• Gruntfile.js (modified) (6 diffs)
• src/wp-admin/includes/update-core.php (modified) (1 diff)
• src/wp-includes/css/media-views.css (modified) (1 diff)
• src/wp-includes/js/media-audiovideo.js (moved) (moved from trunk/src/wp-includes/js/media/audio-video.js )
• src/wp-includes/js/media-grid.js (moved) (moved from trunk/src/wp-includes/js/media/grid.js )
• src/wp-includes/js/media-models.js (moved) (moved from trunk/src/wp-includes/js/media/models.js )
• src/wp-includes/js/media-views.js (moved) (moved from trunk/src/wp-includes/js/media/views.js )
• src/wp-includes/js/media/audiovideo.manifest.js (moved) (moved from trunk/src/wp-includes/js/media/audio-video.manifest.js )
• src/wp-includes/script-loader.php (modified) (3 diffs)

trunk/Gruntfile.js

@@ -5 +5 @@
                 BUILD_DIR = 'build/',
                 mediaConfig = {},
-                mediaBuilds = ['audio-video', 'grid', 'models', 'views'];
+                mediaBuilds = ['audiovideo', 'grid', 'models', 'views'];
 
         // Load tasks.
@@ -13 +13 @@
 
         mediaBuilds.forEach( function ( build ) {
-                var path = SOURCE_DIR + 'wp-includes/js/media/';
+                var path = SOURCE_DIR + 'wp-includes/js/media';
                 mediaConfig[ build ] = { files : {} };
-                mediaConfig[ build ].files[ path + build + '.js' ] = [ path + build + '.manifest.js' ];
+                mediaConfig[ build ].files[ path + '-' + build + '.js' ] = [ path + '/' + build + '.manifest.js' ];
         } );
 
@@ -63 +63 @@
                                                 src: [
                                                         '**',
+                                                        '!wp-includes/js/media/**',
                                                         '!**/.{svn,git}/**', // Ignore version control directories.
                                                         // Ignore unminified versions of external libs we don't ship:
@@ -273 +274 @@
                                         browserify: true
                                 },
-                                expand: true,
-                                cwd: SOURCE_DIR,
-                                src: [
-                                        'wp-includes/js/media/**/*.js',
-                                        '!wp-includes/js/media/*.js',
-                                        'wp-includes/js/media/*.manifest.js'
+                                src: [
+                                        SOURCE_DIR + 'wp-includes/js/media/**/*.js'
                                 ]
                         },
@@ -287 +284 @@
                                         'wp-admin/js/*.js',
                                         'wp-includes/js/*.js',
+                                        // Built scripts.
+                                        '!wp-includes/js/media-*',
                                         // WordPress scripts inside directories
                                         'wp-includes/js/jquery/jquery.table-hotkeys.js',
@@ -629 +628 @@
                 'cssmin:rtl',
                 'cssmin:colors',
-                'browserify',
                 'uglify:core',
-                'uglify:media',
                 'uglify:jqueryui',
                 'concat:tinymce',

trunk/src/wp-admin/includes/update-core.php

@@ -695 +695 @@
 'wp-includes/js/jquery/ui/jquery.ui.tooltip.min.js',
 'wp-includes/js/jquery/ui/jquery.ui.widget.min.js',
-'wp-includes/js/tinymce/skins/wordpress/images/dashicon-no-alt.png',
-// 4.2
-'wp-includes/js/media-audiovideo.js',
-'wp-includes/js/media-audiovideo.min.js',
-'wp-includes/js/media-grid.js',
-'wp-includes/js/media-grid.min.js',
-'wp-includes/js/media-models.js',
-'wp-includes/js/media-models.min.js',
-'wp-includes/js/media-views.js',
-'wp-includes/js/media-views.min.js',
+'wp-includes/js/tinymce/skins/wordpress/images/dashicon-no-alt.png'
 );
 

trunk/src/wp-includes/css/media-views.css

@@ -740 +740 @@
         margin-right: 2%;
         max-width: 42%;
+        max-width: -webkit-calc(48% - 12px);
         max-width: calc(48% - 12px);
 }

trunk/src/wp-includes/script-loader.php

@@ -411 +411 @@
 
         $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( 'wp-backbone' ), false, 1 );
+        $scripts->add( 'media-models', "/wp-includes/js/media-models$suffix.js", array( 'wp-backbone' ), false, 1 );
         did_action( 'init' ) && $scripts->localize( 'media-models', '_wpMediaModelsL10n', array(
                 'settings' => array(
@@ -421 +421 @@
         // 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( 'utils', 'media-models', 'wp-plupload', 'jquery-ui-sortable', 'wp-mediaelement' ), false, 1 );
+        $scripts->add( 'media-views',  "/wp-includes/js/media-views$suffix.js",  array( 'utils', 'media-models', 'wp-plupload', 'jquery-ui-sortable', 'wp-mediaelement' ), false, 1 );
         $scripts->add( 'media-editor', "/wp-includes/js/media-editor$suffix.js", array( 'shortcode', 'media-views' ), false, 1 );
-        $scripts->add( 'media-audiovideo', "/wp-includes/js/media/audio-video$suffix.js", array( 'media-editor' ), false, 1 );
+        $scripts->add( 'media-audiovideo', "/wp-includes/js/media-audiovideo$suffix.js", array( 'media-editor' ), false, 1 );
         $scripts->add( 'mce-view', "/wp-includes/js/mce-view$suffix.js", array( 'shortcode', 'media-models', 'media-audiovideo', 'wp-playlist' ), false, 1 );
 
@@ -557 +557 @@
                 $scripts->add( 'list-revisions', "/wp-includes/js/wp-list-revisions$suffix.js" );
 
-                $scripts->add( 'media-grid', "/wp-includes/js/media/grid$suffix.js", array( 'media-editor' ), false, 1 );
+                $scripts->add( 'media-grid', "/wp-includes/js/media-grid$suffix.js", array( 'media-editor' ), false, 1 );
                 $scripts->add( 'media', "/wp-admin/js/media$suffix.js", array( 'jquery' ), false, 1 );
                 did_action( 'init' ) && $scripts->localize( 'media', 'attachMediaBoxL10n', array(