From 5f808bd8fc79c1d1b965272eaa21584812b459c0 Mon Sep 17 00:00:00 2001 From: "Dominik Schilling (ocean90)" Date: Mon, 29 Feb 2016 20:42:10 +0000 Subject: [PATCH] Media: Add support for minified versions of wp-playlist.js, wp-mediaelement.js and wp-mediaelement.css. Fixes #35984. git-svn-id: https://develop.svn.wordpress.org/trunk@36780 602fd350-edb4-49c9-b593-d223f7449a82 --- Gruntfile.js | 6 +++++- src/wp-includes/script-loader.php | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 158129e93f..564b1eba9c 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -181,7 +181,8 @@ module.exports = function(grunt) { src: [ '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' ] }, rtl: { @@ -323,6 +324,7 @@ module.exports = function(grunt) { // WordPress scripts inside directories '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', 'wp-includes/js/tinymce/plugins/wordpress/plugin.js', @@ -439,6 +441,8 @@ module.exports = function(grunt) { src: [ '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', 'wp-includes/js/tinymce/plugins/wordpress/plugin.js', diff --git a/src/wp-includes/script-loader.php b/src/wp-includes/script-loader.php index b56964ce06..1461e0d292 100644 --- a/src/wp-includes/script-loader.php +++ b/src/wp-includes/script-loader.php @@ -345,7 +345,7 @@ function wp_default_scripts( &$scripts ) { ) ); - $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' ), ); @@ -361,7 +361,7 @@ function wp_default_scripts( &$scripts ) { ); $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' ); did_action( 'init' ) && $scripts->localize( 'zxcvbn-async', '_zxcvbnSettings', array( @@ -762,7 +762,7 @@ function wp_default_styles( &$styles ) { $styles->add( 'imgareaselect', '/wp-includes/js/imgareaselect/imgareaselect.css', array(), '0.9.8' ); $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' ) ); // Deprecated CSS