<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[28044] trunk/src: Widget Customizer: Fix widget filtering.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/28044">28044</a></dd>
<dt>Author</dt> <dd>ocean90</dd>
<dt>Date</dt> <dd>2014-04-08 08:11:33 +0000 (Tue, 08 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Widget Customizer: Fix widget filtering.
props westonruter.
fixes <a href="http://core.trac.wordpress.org/ticket/27451">#27451</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminjscustomizewidgetsjs">trunk/src/wp-admin/js/customize-widgets.js</a></li>
<li><a href="#trunksrcwpincludesclasswpcustomizewidgetsphp">trunk/src/wp-includes/class-wp-customize-widgets.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminjscustomizewidgetsjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/js/customize-widgets.js (28043 => 28044)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/js/customize-widgets.js 2014-04-08 07:48:55 UTC (rev 28043)
+++ trunk/src/wp-admin/js/customize-widgets.js 2014-04-08 08:11:33 UTC (rev 28044)
</span><span class="lines">@@ -36,7 +36,8 @@
</span><span class="cx"> transport: 'refresh',
</span><span class="cx"> params: [],
</span><span class="cx"> width: null,
</span><del>- height: null
</del><ins>+ height: null,
+ search_matched: true
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -71,21 +72,17 @@
</span><span class="cx"> // If search is blank, show all themes
</span><span class="cx"> // Useful for resetting the views when you clean the input
</span><span class="cx"> if ( this.terms === '' ) {
</span><del>- this.reset( api.Widgets.data.availableWidgets );
</del><ins>+ this.each( function ( widget ) {
+ widget.set( 'search_matched', true );
+ } );
</ins><span class="cx"> }
</span><del>-
- // Trigger an 'update' event
- this.trigger( 'update' );
</del><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> // Performs a search within the collection
</span><span class="cx"> // @uses RegExp
</span><span class="cx"> search: function( term ) {
</span><del>- var match, results, haystack;
</del><ins>+ var match, haystack;
</ins><span class="cx">
</span><del>- // Start with a full collection
- this.reset( api.Widgets.data.availableWidgets, { silent: true } );
-
</del><span class="cx"> // Escape the term string for RegExp meta characters
</span><span class="cx"> term = term.replace( /[-\/\\^$*+?.()|[\]{}]/g, '\\$&' );
</span><span class="cx">
</span><span class="lines">@@ -94,13 +91,10 @@
</span><span class="cx"> term = term.replace( / /g, ')(?=.*' );
</span><span class="cx"> match = new RegExp( '^(?=.*' + term + ').+', 'i' );
</span><span class="cx">
</span><del>- results = this.filter( function( data ) {
- haystack = _.union( data.get( 'name' ), data.get( 'id' ), data.get( 'description' ) );
-
- return match.test( haystack );
- });
-
- this.reset( results );
</del><ins>+ this.each( function ( data ) {
+ haystack = [ data.get( 'name' ), data.get( 'id' ), data.get( 'description' ) ].join( ' ' );
+ data.set( 'search_matched', match.test( haystack ) );
+ } );
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx"> api.Widgets.availableWidgets = new api.Widgets.WidgetCollection( api.Widgets.data.availableWidgets );
</span><span class="lines">@@ -176,7 +170,6 @@
</span><span class="cx">
</span><span class="cx"> _.bindAll( this, 'close' );
</span><span class="cx">
</span><del>- this.listenTo( this.collection, 'update', this.updateList );
</del><span class="cx"> this.listenTo( this.collection, 'change', this.updateList );
</span><span class="cx">
</span><span class="cx"> this.updateList();
</span><span class="lines">@@ -222,29 +215,25 @@
</span><span class="cx"> }
</span><span class="cx"> },
</span><span class="cx">
</span><del>- // Changes visibilty of available widgets
</del><ins>+ // Changes visibility of available widgets
</ins><span class="cx"> updateList: function() {
</span><del>- // First hide all widgets...
- this.$el.find( '.widget-tpl' ).hide();
-
- // ..and then show only available widgets which could be filtered
</del><span class="cx"> this.collection.each( function( widget ) {
</span><span class="cx"> var widgetTpl = $( '#widget-tpl-' + widget.id );
</span><del>- widgetTpl.toggle( ! widget.get( 'is_disabled' ) );
</del><ins>+ widgetTpl.toggle( widget.get( 'search_matched' ) && ! widget.get( 'is_disabled' ) );
</ins><span class="cx"> if ( widget.get( 'is_disabled' ) && widgetTpl.is( this.selected ) ) {
</span><span class="cx"> this.selected = null;
</span><span class="cx"> }
</span><span class="cx"> } );
</span><span class="cx"> },
</span><span class="cx">
</span><del>- // Hightlights a widget
</del><ins>+ // Highlights a widget
</ins><span class="cx"> select: function( widgetTpl ) {
</span><span class="cx"> this.selected = $( widgetTpl );
</span><span class="cx"> this.selected.siblings( '.widget-tpl' ).removeClass( 'selected' );
</span><span class="cx"> this.selected.addClass( 'selected' );
</span><span class="cx"> },
</span><span class="cx">
</span><del>- // Hightlights a widget on focus
</del><ins>+ // Highlights a widget on focus
</ins><span class="cx"> focus: function( event ) {
</span><span class="cx"> this.select( $( event.currentTarget ) );
</span><span class="cx"> },
</span><span class="lines">@@ -1601,7 +1590,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * @param {string} widgetId or an id_base for adding a previously non-existing widget
</span><del>- * @returns {object} widget_form control instance
</del><ins>+ * @returns {object|false} widget_form control instance, or false on error
</ins><span class="cx"> */
</span><span class="cx"> addWidget: function( widgetId ) {
</span><span class="cx"> var self = this, controlHtml, $widget, controlType = 'widget_form', $control, controlConstructor,
</span><span class="lines">@@ -1612,11 +1601,11 @@
</span><span class="cx"> settingId, isExistingWidget, widgetFormControl, sidebarWidgets, settingArgs;
</span><span class="cx">
</span><span class="cx"> if ( ! widget ) {
</span><del>- return;
</del><ins>+ return false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( widgetNumber && ! widget.get( 'is_multi' ) ) {
</span><del>- return;
</del><ins>+ return false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Set up new multi widget
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpcustomizewidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/class-wp-customize-widgets.php (28043 => 28044)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/class-wp-customize-widgets.php 2014-04-08 07:48:55 UTC (rev 28043)
+++ trunk/src/wp-includes/class-wp-customize-widgets.php 2014-04-08 08:11:33 UTC (rev 28044)
</span><span class="lines">@@ -1150,7 +1150,7 @@
</span><span class="cx"> $added_input_vars = array();
</span><span class="cx"> if ( ! empty( $_POST['sanitized_widget_setting'] ) ) {
</span><span class="cx"> $sanitized_widget_setting = json_decode( $this->get_post_value( 'sanitized_widget_setting' ), true );
</span><del>- if ( empty( $sanitized_widget_setting ) ) {
</del><ins>+ if ( false === $sanitized_widget_setting ) {
</ins><span class="cx"> $this->stop_capturing_option_updates();
</span><span class="cx"> return new WP_Error( 'widget_setting_malformed' );
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>