From c26ea8e3e5be9d6c352d6e7bdb91b37217063d07 Mon Sep 17 00:00:00 2001 From: Scott Taylor Date: Fri, 15 Aug 2014 18:59:25 +0000 Subject: [PATCH] Media Grid: `$.when` expects a splat. Disambiguation: change `cache` to `refresh` as the arg name for `_requery()`. See [29490], #29145. git-svn-id: https://develop.svn.wordpress.org/trunk@29507 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/js/media-models.js | 4 ++-- src/wp-includes/js/media-views.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/wp-includes/js/media-models.js b/src/wp-includes/js/media-models.js index d267de4699..6b62a0b429 100644 --- a/src/wp-includes/js/media-models.js +++ b/src/wp-includes/js/media-models.js @@ -824,11 +824,11 @@ window.wp = window.wp || {}; /** * @access private */ - _requery: function( cache ) { + _requery: function( refresh ) { var props; if ( this.props.get('query') ) { props = this.props.toJSON(); - props.cache = ( true !== cache ); + props.cache = ( true !== refresh || _.isUndefined( refresh ) ); this.mirror( Query.get( props ) ); } }, diff --git a/src/wp-includes/js/media-views.js b/src/wp-includes/js/media-views.js index ce1cb4be60..24ddc00b3e 100644 --- a/src/wp-includes/js/media-views.js +++ b/src/wp-includes/js/media-views.js @@ -5906,7 +5906,7 @@ } if ( changed.length ) { - $.when( changed ).then( function() { + $.when.apply( null, changed ).then( function() { library._requery( true ); } ); }