Changeset 37322

Timestamp:

04/28/2016 06:19:15 PM (10 years ago)

Author:

westonruter

Message:

Customize: Remove format placeholders from widget templates and selectors, fixing a jQuery selector syntax error and the broken highlight/shift-click behaviors.

The issues occur in themes that register sidebars that reference a single format placeholder (%1$s and %2$s) multiple times, such as in the id and class attributes for $before_widget.

Props martin.krcho, westonruter.
Fixes #36473.

File:

• trunk/src/wp-includes/js/customize-preview-widgets.js (modified) (3 diffs)

trunk/src/wp-includes/js/customize-preview-widgets.js

@@ -373 +373 @@
 
                                 widgetContainerElement = $(
-                                        sidebarPartial.params.sidebarArgs.before_widget.replace( '%1$s', widgetId ).replace( '%2$s', 'widget' ) +
+                                        sidebarPartial.params.sidebarArgs.before_widget.replace( /%1\$s/g, widgetId ).replace( /%2\$s/g, 'widget' ) +
                                         sidebarPartial.params.sidebarArgs.after_widget
                                 );
@@ -512 +512 @@
                 $.each( self.registeredSidebars, function( i, sidebar ) {
                         var widgetTpl = [
-                                        sidebar.before_widget.replace( '%1$s', '' ).replace( '%2$s', '' ),
+                                        sidebar.before_widget,
                                         sidebar.before_title,
                                         sidebar.after_title,
@@ -525 +525 @@
                         widgetClasses = emptyWidget.prop( 'className' );
 
+                        // Remove class names that incorporate the string formatting placeholders %1$s and %2$s.
+                        widgetClasses = widgetClasses.replace( /\S*%[12]\$s\S*/g, '' );
+                        widgetClasses = widgetClasses.replace( /^\s+|\s+$/g, '' );
+
                         // Prevent a rare case when before_widget, before_title, after_title and after_widget is empty.
                         if ( ! widgetClasses ) {
                                 return;
                         }
-
-                        widgetClasses = widgetClasses.replace( /^\s+|\s+$/g, '' );
 
                         if ( widgetClasses ) {