sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

External Libraries: Update Masonry shim to prevent error using isAnimated option

Browse Source 
The isAnimated option throws an error and causes Masonry to stop functioning. Masonry.prototype.options is no longer defined in 3.3.2, this.options is and does the same. Masonry was updated to 3.3.2 in [37891].

Reported upstream: https://github.com/desandro/masonry-v2-3-shim/pull/1

Props stephenharris, ocean90, azaozz for testing and second sign off.
See #37666, #32802.



git-svn-id: https://develop.svn.wordpress.org/trunk@38261 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Aaron Jorbin 2016-08-15 18:19:18 +00:00
parent e8f182885a
commit 40c9dcfa80
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/wp-includes/js/jquery/jquery.masonry.js
View File

@ -26,7 +26,7 @@
var isAniOption = this.options.isAnimated; var isAniOption = this.options.isAnimated;
if ( isAniOption !== undefined ) { if ( isAniOption !== undefined ) {
this.options.transitionDuration = isAniOption ? this.options.transitionDuration = isAniOption ?
Masonry.prototype.options.transitionDuration : 0; this.options.transitionDuration : 0;
} }
if ( isAniOption === undefined || isAniOption ) { if ( isAniOption === undefined || isAniOption ) {

2
src/wp-includes/script-loader.php
View File

@ -250,7 +250,7 @@ function wp_default_scripts( &$scripts ) {
// It sets jQuery as a dependency, as the theme may have been implicitly loading it this way. // It sets jQuery as a dependency, as the theme may have been implicitly loading it this way.
$scripts->add( 'imagesloaded', "/wp-includes/js/imagesloaded.min.js", array(), '3.2.0', 1 ); $scripts->add( 'imagesloaded', "/wp-includes/js/imagesloaded.min.js", array(), '3.2.0', 1 );
$scripts->add( 'masonry', "/wp-includes/js/masonry.min.js", array( 'imagesloaded' ), '3.3.2', 1 ); $scripts->add( 'masonry', "/wp-includes/js/masonry.min.js", array( 'imagesloaded' ), '3.3.2', 1 );
$scripts->add( 'jquery-masonry', "/wp-includes/js/jquery/jquery.masonry$dev_suffix.js", array( 'jquery', 'masonry' ), '3.1.2', 1 ); $scripts->add( 'jquery-masonry', "/wp-includes/js/jquery/jquery.masonry$dev_suffix.js", array( 'jquery', 'masonry' ), '3.1.2a', 1 );
$scripts->add( 'thickbox', "/wp-includes/js/thickbox/thickbox.js", array('jquery'), '3.1-20121105', 1 ); $scripts->add( 'thickbox', "/wp-includes/js/thickbox/thickbox.js", array('jquery'), '3.1-20121105', 1 );
did_action( 'init' ) && $scripts->localize( 'thickbox', 'thickboxL10n', array( did_action( 'init' ) && $scripts->localize( 'thickbox', 'thickboxL10n', array(