Changeset 38166

Timestamp:

07/27/2016 04:26:22 PM (7 years ago)

Author:

westonruter

Message:

Customize: Prevent customize-preview-widgets JS errors in preview if a sidebar is registered with empty before_widget/after_widget params.

Selective refresh will not be available for widgets when they lack these params, so previewing will fallback to full page refreshes. Sidebars registered as such should be rare so this accounts for an edge case.

Fixes #37478.

File:

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

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

@@ -377 +377 @@
                 );
 
+                // Handle rare case where before_widget and after_widget are empty.
+                if ( ! widgetContainerElement[0] ) {
+                    return;
+                }
+
                 widgetContainerElement.attr( 'data-customize-partial-id', widgetPartial.id );
                 widgetContainerElement.attr( 'data-customize-partial-type', 'widget' );
@@ -522 +527 @@
 
             emptyWidget = $( widgetTpl );
-            widgetSelector = emptyWidget.prop( 'tagName' );
-            widgetClasses = emptyWidget.prop( 'className' );
+            widgetSelector = emptyWidget.prop( 'tagName' ) || '';
+            widgetClasses = emptyWidget.prop( 'className' ) || '';
+
+            // Prevent a rare case when before_widget, before_title, after_title and after_widget is empty.
+            if ( ! widgetClasses ) {
+                return;
+            }
 
             // 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;
-            }
-
-            if ( widgetClasses ) {
-                widgetSelector += '.' + widgetClasses.split( /\s+/ ).join( '.' );
-            }
+            widgetSelector += '.' + widgetClasses.split( /\s+/ ).join( '.' );
             self.widgetSelectors.push( widgetSelector );
         });