WordPress.org

Make WordPress Core

Changeset 36780


Ignore:
Timestamp:
02/29/2016 08:42:10 PM (4 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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Gruntfile.js

    r36351 r36780  
    182182                    'wp-admin/css/*.css',
    183183                    '!wp-admin/css/wp-admin*.css',
    184                     'wp-includes/css/*.css'
     184                    'wp-includes/css/*.css',
     185                    'wp-includes/js/mediaelement/wp-mediaelement.css'
    185186                ]
    186187            },
     
    324325                    'wp-includes/js/jquery/jquery.table-hotkeys.js',
    325326                    'wp-includes/js/mediaelement/wp-mediaelement.js',
     327                    'wp-includes/js/mediaelement/wp-playlist.js',
    326328                    'wp-includes/js/plupload/handlers.js',
    327329                    'wp-includes/js/plupload/wp-plupload.js',
     
    440442                    'wp-admin/js/*.js',
    441443                    'wp-includes/js/*.js',
     444                    'wp-includes/js/mediaelement/wp-mediaelement.js',
     445                    'wp-includes/js/mediaelement/wp-playlist.js',
    442446                    'wp-includes/js/plupload/handlers.js',
    443447                    'wp-includes/js/plupload/wp-plupload.js',
  • trunk/src/wp-includes/script-loader.php

    r36744 r36780  
    346346
    347347
    348     $scripts->add( 'wp-mediaelement', "/wp-includes/js/mediaelement/wp-mediaelement.js", array('mediaelement'), false, 1 );
     348    $scripts->add( 'wp-mediaelement', "/wp-includes/js/mediaelement/wp-mediaelement$suffix.js", array('mediaelement'), false, 1 );
    349349    $mejs_settings = array(
    350350        'pluginPath' => includes_url( 'js/mediaelement/', 'relative' ),
     
    362362
    363363    $scripts->add( 'froogaloop',  "/wp-includes/js/mediaelement/froogaloop.min.js", array(), '2.0' );
    364     $scripts->add( 'wp-playlist', "/wp-includes/js/mediaelement/wp-playlist.js", array( 'wp-util', 'backbone', 'mediaelement' ), false, 1 );
     364    $scripts->add( 'wp-playlist', "/wp-includes/js/mediaelement/wp-playlist$suffix.js", array( 'wp-util', 'backbone', 'mediaelement' ), false, 1 );
    365365
    366366    $scripts->add( 'zxcvbn-async', "/wp-includes/js/zxcvbn-async$suffix.js", array(), '1.0' );
     
    763763    $styles->add( 'wp-jquery-ui-dialog', "/wp-includes/css/jquery-ui-dialog$suffix.css", array( 'dashicons' ) );
    764764    $styles->add( 'mediaelement',        "/wp-includes/js/mediaelement/mediaelementplayer.min.css", array(), '2.18.1' );
    765     $styles->add( 'wp-mediaelement',     "/wp-includes/js/mediaelement/wp-mediaelement.css", array( 'mediaelement' ) );
     765    $styles->add( 'wp-mediaelement',     "/wp-includes/js/mediaelement/wp-mediaelement$suffix.css", array( 'mediaelement' ) );
    766766    $styles->add( 'thickbox',            '/wp-includes/js/thickbox/thickbox.css', array( 'dashicons' ) );
    767767
Note: See TracChangeset for help on using the changeset viewer.