From 12f66b9859b8da62dda44d4b3ad4e643800af6ba Mon Sep 17 00:00:00 2001 From: Andrew Nacin Date: Sat, 5 Apr 2014 20:45:37 +0000 Subject: [PATCH] Theme Installer: Separate API from an event handler to avoid issues where a false return value stops the event. see #27055. git-svn-id: https://develop.svn.wordpress.org/trunk@27963 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/js/theme.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/wp-admin/js/theme.js b/src/wp-admin/js/theme.js index ce7752bd2d..cec89a285a 100644 --- a/src/wp-admin/js/theme.js +++ b/src/wp-admin/js/theme.js @@ -1236,8 +1236,8 @@ themes.view.Installer = themes.view.Appearance.extend({ 'click .theme-section': 'onSort', 'click .theme-filter': 'onFilter', 'click .more-filters': 'moreFilters', - 'click .apply-filters': 'addFilter', - 'click [type="checkbox"]': 'filtersChecked', + 'click .apply-filters': 'applyFilters', + 'click [type="checkbox"]': 'addFilter', 'click .clear-filters': 'clearFilters', 'click .feature-name': 'filterSection', 'click .filtering-by a': 'backToFilters' @@ -1365,8 +1365,13 @@ themes.view.Installer = themes.view.Appearance.extend({ this.collection.query( request ); }, - // Clicking on a checkbox triggers a tag request - addFilter: function( event ) { + // Clicking on a checkbox to add another filter to the request + addFilter: function() { + this.filtersChecked(); + }, + + // Applying filters triggers a tag request + applyFilters: function( event ) { var name, tags = this.filtersChecked(), request = { tag: tags },