Changeset 48461

Timestamp:

07/13/2020 08:13:49 PM (4 years ago)

Author:

whyisjake

Message:

Customize: Ensure that widgets and nav-menus can be closed after entering content.

Previously, the ⌧ button would close the search panel, or remove the results. This restores that, in addition pressing escape will do the same.

Fixes #48198.

Props garrett-eclipse, tobifjellner, afercia, JavierCasares.

Location:

trunk/src/js/_enqueues/wp/customize

Files:

• nav-menus.js (modified) (3 diffs)
• widgets.js (modified) (2 diffs)

trunk/src/js/_enqueues/wp/customize/nav-menus.js

@@ -217 +217 @@
             } );
 
-            // Clear the search results and trigger a `keyup` event to fire a new search.
+            // Clear the search results and trigger an `input` event to fire a new search.
             this.$clearResults.on( 'click', function() {
-                self.$search.val( '' ).focus().trigger( 'keyup' );
+                self.$search.val( '' ).focus().trigger( 'input' );
             } );
 
@@ -734 +734 @@
             $( '#available-menu-items .menu-item-handle.item-added' ).removeClass( 'item-added' );
 
-            this.$search.val( '' ).trigger( 'keyup' );
+            this.$search.val( '' ).trigger( 'input' );
         },
 
@@ -1820 +1820 @@
                  * If the menu item deleted is the only of its instance left,
                  * remove the check icon of this menu item in the right panel.
-                 */ 
+                 */
                 _.each( addedItems, function( addedItem ) {
                     var menuItemId, menuItemControl, matches;
-                        
+
                     // This is because menu item that's deleted is just hidden.
                     if ( ! $( addedItem ).is( ':visible' ) ) {

trunk/src/js/_enqueues/wp/customize/widgets.js

@@ -194 +194 @@
             } );
 
-            // Clear the search results and trigger a new search.
+            // Clear the search results and trigger an `input` event to fire a new search.
             this.$clearResults.on( 'click', function() {
-                self.$search.val( '' ).focus();
-                self.collection.doSearch( '' );
+                self.$search.val( '' ).focus().trigger( 'input' );
             } );
 
@@ -386 +385 @@
             $( 'body' ).removeClass( 'adding-widget' );
 
-            this.$search.val( '' );
+            this.$search.val( '' ).trigger( 'input' );
         },