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

aaronjorbin · aaronjorbin · commit 2590f45b6ae8 · 2016-08-15T18:21:13.000Z
Merges [38261] to the 4.6 branch. 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: desandro/masonry-v2-3-shim#1 Props stephenharris, ocean90, azaozz for testing and second sign off. Fixes #37666. See #32802. git-svn-id: https://develop.svn.wordpress.org/branches/4.6@38262 602fd350-edb4-49c9-b593-d223f7449a82
diff --git 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
@@ -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(

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`var isAniOption = this.options.isAnimated;`
`27`	`27`	`if ( isAniOption !== undefined ) {`
`28`	`28`	`this.options.transitionDuration = isAniOption ?`
`29`		`- Masonry.prototype.options.transitionDuration : 0;`
	`29`	`+ this.options.transitionDuration : 0;`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`if ( isAniOption === undefined \|\| isAniOption ) {`