WordPress.org

Make WordPress Core

Changeset 38262 for branches/4.6


Ignore:
Timestamp:
08/15/16 18:21:13 (11 months ago)
Author:
jorbin
Message:

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

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: https://github.com/desandro/masonry-v2-3-shim/pull/1

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

Location:
branches/4.6
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/4.6

  • branches/4.6/src/wp-includes/js/jquery/jquery.masonry.js

    r27779 r38262  
    2727    if ( isAniOption !== undefined ) { 
    2828      this.options.transitionDuration = isAniOption ? 
    29         Masonry.prototype.options.transitionDuration : 0; 
     29        this.options.transitionDuration : 0; 
    3030    } 
    3131 
  • branches/4.6/src/wp-includes/script-loader.php

    r38222 r38262  
    251251    $scripts->add( 'imagesloaded', "/wp-includes/js/imagesloaded.min.js", array(), '3.2.0', 1 ); 
    252252    $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.2', 1 ); 
     253    $scripts->add( 'jquery-masonry', "/wp-includes/js/jquery/jquery.masonry$dev_suffix.js", array( 'jquery', 'masonry' ), '3.1.2a', 1 ); 
    254254 
    255255    $scripts->add( 'thickbox', "/wp-includes/js/thickbox/thickbox.js", array('jquery'), '3.1-20121105', 1 ); 
Note: See TracChangeset for help on using the changeset viewer.