Changeset 28044

Timestamp:

04/08/2014 08:11:33 AM (11 years ago)

Author:

ocean90

Message:

Widget Customizer: Fix widget filtering.

props westonruter.
fixes #27451.

Location:

trunk/src

Files:

• wp-admin/js/customize-widgets.js (modified) (10 diffs)
• wp-includes/class-wp-customize-widgets.php (modified) (1 diff)

trunk/src/wp-admin/js/customize-widgets.js

@@ -37 +37 @@
         params: [],
         width: null,
-        height: null
+        height: null,
+        search_matched: true
     });
 
@@ -72 +73 @@
             // Useful for resetting the views when you clean the input
             if ( this.terms === '' ) {
-                this.reset( api.Widgets.data.availableWidgets );
-            }
-
-            // Trigger an 'update' event
-            this.trigger( 'update' );
+                this.each( function ( widget ) {
+                    widget.set( 'search_matched', true );
+                } );
+            }
         },
 
@@ -82 +82 @@
         // @uses RegExp
         search: function( term ) {
-            var match, results, haystack;
-
-            // Start with a full collection
-            this.reset( api.Widgets.data.availableWidgets, { silent: true } );
+            var match, haystack;
 
             // Escape the term string for RegExp meta characters
@@ -95 +92 @@
             match = new RegExp( '^(?=.*' + term + ').+', 'i' );
 
-            results = this.filter( function( data ) {
-                haystack = _.union( data.get( 'name' ), data.get( 'id' ), data.get( 'description' ) );
-
-                return match.test( haystack );
-            });
-
-            this.reset( results );
+            this.each( function ( data ) {
+                haystack = [ data.get( 'name' ), data.get( 'id' ), data.get( 'description' ) ].join( ' ' );
+                data.set( 'search_matched', match.test( haystack ) );
+            } );
         }
     });
@@ -177 +171 @@
             _.bindAll( this, 'close' );
 
-            this.listenTo( this.collection, 'update', this.updateList );
             this.listenTo( this.collection, 'change', this.updateList );
 
@@ -223 +216 @@
         },
 
-        // Changes visibilty of available widgets
+        // Changes visibility of available widgets
         updateList: function() {
-            // First hide all widgets...
-            this.$el.find( '.widget-tpl' ).hide();
-
-            // ..and then show only available widgets which could be filtered
             this.collection.each( function( widget ) {
                 var widgetTpl = $( '#widget-tpl-' + widget.id );
-                widgetTpl.toggle( ! widget.get( 'is_disabled' ) );
+                widgetTpl.toggle( widget.get( 'search_matched' ) && ! widget.get( 'is_disabled' ) );
                 if ( widget.get( 'is_disabled' ) && widgetTpl.is( this.selected ) ) {
                     this.selected = null;
@@ -238 +227 @@
         },
 
-        // Hightlights a widget
+        // Highlights a widget
         select: function( widgetTpl ) {
             this.selected = $( widgetTpl );
@@ -245 +234 @@
         },
 
-        // Hightlights a widget on focus
+        // Highlights a widget on focus
         focus: function( event ) {
             this.select( $( event.currentTarget ) );
@@ -1602 +1591 @@
         /**
          * @param {string} widgetId or an id_base for adding a previously non-existing widget
-         * @returns {object} widget_form control instance
+         * @returns {object|false} widget_form control instance, or false on error
          */
         addWidget: function( widgetId ) {
@@ -1613 +1602 @@
 
             if ( ! widget ) {
-                return;
+                return false;
             }
 
             if ( widgetNumber && ! widget.get( 'is_multi' ) ) {
-                return;
+                return false;
             }
 

trunk/src/wp-includes/class-wp-customize-widgets.php

@@ -1151 +1151 @@
         if ( ! empty( $_POST['sanitized_widget_setting'] ) ) {
             $sanitized_widget_setting = json_decode( $this->get_post_value( 'sanitized_widget_setting' ), true );
-            if ( empty( $sanitized_widget_setting ) ) {
+            if ( false === $sanitized_widget_setting ) {
                 $this->stop_capturing_option_updates();
                 return new WP_Error( 'widget_setting_malformed' );