Changeset 36780

Timestamp:

02/29/2016 08:42:10 PM (8 years ago)

Author:

ocean90

Message:

Media: Add support for minified versions of wp-playlist.js, wp-mediaelement.js and wp-mediaelement.css.

Fixes #35984.

Location:

trunk

Files:

• Gruntfile.js (modified) (3 diffs)
• src/wp-includes/script-loader.php (modified) (3 diffs)

trunk/Gruntfile.js

@@ -182 +182 @@
                     'wp-admin/css/*.css',
                     '!wp-admin/css/wp-admin*.css',
-                    'wp-includes/css/*.css'
+                    'wp-includes/css/*.css',
+                    'wp-includes/js/mediaelement/wp-mediaelement.css'
                 ]
             },
@@ -324 +325 @@
                     'wp-includes/js/jquery/jquery.table-hotkeys.js',
                     'wp-includes/js/mediaelement/wp-mediaelement.js',
+                    'wp-includes/js/mediaelement/wp-playlist.js',
                     'wp-includes/js/plupload/handlers.js',
                     'wp-includes/js/plupload/wp-plupload.js',
@@ -440 +442 @@
                     'wp-admin/js/*.js',
                     'wp-includes/js/*.js',
+                    'wp-includes/js/mediaelement/wp-mediaelement.js',
+                    'wp-includes/js/mediaelement/wp-playlist.js',
                     'wp-includes/js/plupload/handlers.js',
                     'wp-includes/js/plupload/wp-plupload.js',

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

@@ -346 +346 @@
 
 
-    $scripts->add( 'wp-mediaelement', "/wp-includes/js/mediaelement/wp-mediaelement.js", array('mediaelement'), false, 1 );
+    $scripts->add( 'wp-mediaelement', "/wp-includes/js/mediaelement/wp-mediaelement$suffix.js", array('mediaelement'), false, 1 );
     $mejs_settings = array(
         'pluginPath' => includes_url( 'js/mediaelement/', 'relative' ),
@@ -362 +362 @@
 
     $scripts->add( 'froogaloop',  "/wp-includes/js/mediaelement/froogaloop.min.js", array(), '2.0' );
-    $scripts->add( 'wp-playlist', "/wp-includes/js/mediaelement/wp-playlist.js", array( 'wp-util', 'backbone', 'mediaelement' ), false, 1 );
+    $scripts->add( 'wp-playlist', "/wp-includes/js/mediaelement/wp-playlist$suffix.js", array( 'wp-util', 'backbone', 'mediaelement' ), false, 1 );
 
     $scripts->add( 'zxcvbn-async', "/wp-includes/js/zxcvbn-async$suffix.js", array(), '1.0' );
@@ -763 +763 @@
     $styles->add( 'wp-jquery-ui-dialog', "/wp-includes/css/jquery-ui-dialog$suffix.css", array( 'dashicons' ) );
     $styles->add( 'mediaelement',        "/wp-includes/js/mediaelement/mediaelementplayer.min.css", array(), '2.18.1' );
-    $styles->add( 'wp-mediaelement',     "/wp-includes/js/mediaelement/wp-mediaelement.css", array( 'mediaelement' ) );
+    $styles->add( 'wp-mediaelement',     "/wp-includes/js/mediaelement/wp-mediaelement$suffix.css", array( 'mediaelement' ) );
     $styles->add( 'thickbox',            '/wp-includes/js/thickbox/thickbox.css', array( 'dashicons' ) );