From 40c9dcfa80a5da78b4a77fd945aed9cbe2b27fc0 Mon Sep 17 00:00:00 2001 From: Aaron Jorbin Date: Mon, 15 Aug 2016 18:19:18 +0000 Subject: [PATCH] External Libraries: Update Masonry shim to prevent error using isAnimated option 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 --- src/wp-includes/js/jquery/jquery.masonry.js | 2 +- src/wp-includes/script-loader.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/wp-includes/js/jquery/jquery.masonry.js b/src/wp-includes/js/jquery/jquery.masonry.js index aceb766dfa..c4228bf4f6 100644 --- a/src/wp-includes/js/jquery/jquery.masonry.js +++ b/src/wp-includes/js/jquery/jquery.masonry.js @@ -26,7 +26,7 @@ var isAniOption = this.options.isAnimated; if ( isAniOption !== undefined ) { this.options.transitionDuration = isAniOption ? - Masonry.prototype.options.transitionDuration : 0; + this.options.transitionDuration : 0; } if ( isAniOption === undefined || isAniOption ) { diff --git a/src/wp-includes/script-loader.php b/src/wp-includes/script-loader.php index 842405c3c9..b4790d4d20 100644 --- a/src/wp-includes/script-loader.php +++ b/src/wp-includes/script-loader.php @@ -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. $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( '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 ); did_action( 'init' ) && $scripts->localize( 'thickbox', 'thickboxL10n', array(