← Back to branch summary

~canonical-sysadmins/wordpress/4.6.1

« back to all changes in this revision

Viewing changes to wp-includes/script-loader.php

  • Committer: Barry Price
  • Date: 2016-09-08 02:50:41 UTC
  • mfrom: (1.1.19 upstream)
  • Revision ID: barry.price@canonical.com-20160908025041-xblhpbi3hq55m5y3
Merge WP4.6.1 from upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
wp-includes/script-loader.php
250
250
        // It sets jQuery as a dependency, as the theme may have been implicitly loading it this way.
251
251
        $scripts->add( 'imagesloaded', "/wp-includes/js/imagesloaded.min.js", array(), '3.2.0', 1 );
252
252
        $scripts->add( 'masonry', "/wp-includes/js/masonry.min.js", array( 'imagesloaded' ), '3.3.2', 1 );
253
 
        $scripts->add( 'jquery-masonry', "/wp-includes/js/jquery/jquery.masonry$dev_suffix.js", array( 'jquery', 'masonry' ), '3.1.2a', 1 );
 
253
        $scripts->add( 'jquery-masonry', "/wp-includes/js/jquery/jquery.masonry$dev_suffix.js", array( 'jquery', 'masonry' ), '3.1.2b', 1 );
254
254
 
255
255
        $scripts->add( 'thickbox', "/wp-includes/js/thickbox/thickbox.js", array('jquery'), '3.1-20121105', 1 );
256
256
        did_action( 'init' ) && $scripts->localize( 'thickbox', 'thickboxL10n', array(
563
563
                        'suggestedImgAlt' => __( 'Suggested image #%d' ),
564
564
                ) );
565
565
 
566
 
                $scripts->add( 'editor-expand', "/wp-admin/js/editor-expand$suffix.js", array( 'jquery' ), false, 1 );
 
566
                $scripts->add( 'editor-expand', "/wp-admin/js/editor-expand$suffix.js", array( 'jquery', 'underscore' ), false, 1 );
567
567
 
568
568
                $scripts->add( 'link', "/wp-admin/js/link$suffix.js", array( 'wp-lists', 'postbox' ), false, 1 );
569
569