Changeset 38261 for trunk

Timestamp:

08/15/2016 06:19:18 PM (8 years ago)

Author:

jorbin

Message:

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.

Location:

trunk/src/wp-includes

Files:

• js/jquery/jquery.masonry.js (modified) (1 diff)
• script-loader.php (modified) (1 diff)

trunk/src/wp-includes/js/jquery/jquery.masonry.js

@@ -27 +27 @@
     if ( isAniOption !== undefined ) {
       this.options.transitionDuration = isAniOption ?
-        Masonry.prototype.options.transitionDuration : 0;
+        this.options.transitionDuration : 0;
     }
 

trunk/src/wp-includes/script-loader.php

@@ -251 +251 @@
     $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 );