<!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>[27653] trunk/src: Widget Customizer: Fix 'WidgetCustomizerPreview' is undefined error in IE8/9.</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/27653">27653</a></dd>
<dt>Author</dt> <dd>ocean90</dd>
<dt>Date</dt> <dd>2014-03-22 21:03:18 +0000 (Sat, 22 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Widget Customizer: Fix 'WidgetCustomizerPreview' is undefined error in IE8/9.
* Move `WidgetCustomizerPreview` to `wp.customize.WidgetCustomizerPreview`
* Move `WidgetCustomizerPreview_exports` to export_preview_data()
* Use `_wpWidgetCustomizerPreviewSettings` to transfer settings to `wp.customize.WidgetCustomizerPreview`
see <a href="http://core.trac.wordpress.org/ticket/27485">#27485</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>
<li><a href="#trunksrcwpincludesjscustomizepreviewwidgetsjs">trunk/src/wp-includes/js/customize-preview-widgets.js</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 (27652 => 27653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/js/customize-widgets.js 2014-03-22 20:54:17 UTC (rev 27652)
+++ trunk/src/wp-admin/js/customize-widgets.js 2014-03-22 21:03:18 UTC (rev 27653)
</span><span class="lines">@@ -1510,7 +1510,7 @@
</span><span class="cx"> */
</span><span class="cx"> getPreviewWidgetElement: function () {
</span><span class="cx"> var control = this,
</span><del>- widget_customizer_preview = self.getPreviewWindow().WidgetCustomizerPreview;
</del><ins>+ widget_customizer_preview = self.getPreviewWindow().wp.customize.WidgetCustomizerPreview;
</ins><span class="cx"> return widget_customizer_preview.getWidgetElement( control.params.widget_id );
</span><span class="cx"> },
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpcustomizewidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/class-wp-customize-widgets.php (27652 => 27653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/class-wp-customize-widgets.php 2014-03-22 20:54:17 UTC (rev 27652)
+++ trunk/src/wp-includes/class-wp-customize-widgets.php 2014-03-22 21:03:18 UTC (rev 27653)
</span><span class="lines">@@ -696,8 +696,9 @@
</span><span class="cx"> */
</span><span class="cx"> static function customize_preview_init() {
</span><span class="cx"> add_filter( 'sidebars_widgets', array( __CLASS__, 'preview_sidebars_widgets' ), 1 );
</span><del>- add_action( 'wp_enqueue_scripts', array( __CLASS__, 'customize_preview_enqueue_deps' ) );
- add_action( 'wp_footer', array( __CLASS__, 'export_preview_data' ), 9999 );
</del><ins>+ add_action( 'wp_enqueue_scripts', array( __CLASS__, 'customize_preview_enqueue' ) );
+ add_action( 'wp_print_styles', array( __CLASS__, 'inject_preview_css' ), 1 );
+ add_action( 'wp_footer', array( __CLASS__, 'export_preview_data' ), 20 );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -719,29 +720,9 @@
</span><span class="cx"> *
</span><span class="cx"> * @action wp_enqueue_scripts
</span><span class="cx"> */
</span><del>- static function customize_preview_enqueue_deps() {
</del><ins>+ static function customize_preview_enqueue() {
</ins><span class="cx"> wp_enqueue_script( 'customize-preview-widgets' );
</span><del>-
- add_action( 'wp_print_styles', array( __CLASS__, 'inject_preview_css' ), 1 );
-
- // Why not wp_localize_script? Because we're not localizing, and it forces values into strings
- global $wp_scripts;
- $exports = array(
- 'registered_sidebars' => array_values( $GLOBALS['wp_registered_sidebars'] ),
- 'registered_widgets' => $GLOBALS['wp_registered_widgets'],
- 'i18n' => array(
- 'widget_tooltip' => ( 'Shift-click to edit this widget.' ),
- ),
- );
- foreach ( $exports['registered_widgets'] as &$registered_widget ) {
- unset( $registered_widget['callback'] ); // may not be JSON-serializeable
</del><span class="cx"> }
</span><del>- $wp_scripts->add_data(
- 'customize-preview-widgets',
- 'data',
- sprintf( 'var WidgetCustomizerPreview_exports = %s;', json_encode( $exports ) )
- );
- }
</del><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Insert default style for highlighted widget at early point so theme
</span><span class="lines">@@ -767,14 +748,23 @@
</span><span class="cx"> * @action wp_footer
</span><span class="cx"> */
</span><span class="cx"> static function export_preview_data() {
</span><del>- wp_print_scripts( array( 'customize-preview-widgets' ) );
</del><ins>+ // Prepare customizer settings to pass to Javascript.
+ $settings = array(
+ 'renderedSidebars' => array_fill_keys( array_unique( self::$rendered_sidebars ), true ),
+ 'renderedWidgets' => array_fill_keys( array_keys( self::$rendered_widgets ), true ),
+ 'registeredSidebars' => array_values( $GLOBALS['wp_registered_sidebars'] ),
+ 'registeredWidgets' => $GLOBALS['wp_registered_widgets'],
+ 'l10n' => array(
+ 'widgetTooltip' => ( 'Shift-click to edit this widget.' ),
+ ),
+ );
+ foreach ( $settings['registeredWidgets'] as &$registered_widget ) {
+ unset( $registered_widget['callback'] ); // may not be JSON-serializeable
+ }
+
</ins><span class="cx"> ?>
</span><del>- <script>
- (function () {
- /*global WidgetCustomizerPreview */
- WidgetCustomizerPreview.rendered_sidebars = <?php echo json_encode( array_fill_keys( array_unique( self::$rendered_sidebars ), true ) ) ?>;
- WidgetCustomizerPreview.rendered_widgets = <?php echo json_encode( array_fill_keys( array_keys( self::$rendered_widgets ), true ) ); ?>;
- }());
</del><ins>+ <script type="text/javascript">
+ var _wpWidgetCustomizerPreviewSettings = <?php echo json_encode( $settings ); ?>;
</ins><span class="cx"> </script>
</span><span class="cx"> <?php
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunksrcwpincludesjscustomizepreviewwidgetsjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/customize-preview-widgets.js (27652 => 27653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/customize-preview-widgets.js 2014-03-22 20:54:17 UTC (rev 27652)
+++ trunk/src/wp-includes/js/customize-preview-widgets.js 2014-03-22 21:03:18 UTC (rev 27653)
</span><span class="lines">@@ -1,24 +1,31 @@
</span><del>-/*global jQuery, WidgetCustomizerPreview_exports */
-/*exported WidgetCustomizerPreview */
-var WidgetCustomizerPreview = (function ($) {
- 'use strict';
</del><ins>+(function( $, wp ){
</ins><span class="cx">
</span><del>- var OldPreview, self = {
- rendered_sidebars: {}, // @todo Make rendered a property of the Backbone model
- rendered_widgets: {}, // @todo Make rendered a property of the Backbone model
- registered_sidebars: [], // @todo Make a Backbone collection
- registered_widgets: {}, // @todo Make array, Backbone collection
- widget_selectors: [],
</del><ins>+ if ( ! wp || ! wp.customize ) { return; }
+
+ var api = wp.customize,
+ OldPreview;
+
+ /**
+ * wp.customize.WidgetCustomizerPreview
+ *
+ */
+ api.WidgetCustomizerPreview = {
+ renderedSidebars: {}, // @todo Make rendered a property of the Backbone model
+ renderedWidgets: {}, // @todo Make rendered a property of the Backbone model
+ registeredSidebars: [], // @todo Make a Backbone collection
+ registeredWidgets: {}, // @todo Make array, Backbone collection
+ widgetSelectors: [],
</ins><span class="cx"> preview: null,
</span><del>- i18n: {},
</del><ins>+ l10n: {},
</ins><span class="cx">
</span><span class="cx"> init: function () {
</span><ins>+ var self = this;
</ins><span class="cx"> this.buildWidgetSelectors();
</span><span class="cx"> this.highlightControls();
</span><span class="cx">
</span><del>- self.preview.bind( 'active', function() {
- self.preview.send( 'rendered-sidebars', self.rendered_sidebars ); // @todo Only send array of IDs
- self.preview.send( 'rendered-widgets', self.rendered_widgets ); // @todo Only send array of IDs
</del><ins>+ this.preview.bind( 'active', function() {
+ self.preview.send( 'rendered-sidebars', self.renderedSidebars ); // @todo Only send array of IDs
+ self.preview.send( 'rendered-widgets', self.renderedWidgets ); // @todo Only send array of IDs
</ins><span class="cx"> } );
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -26,25 +33,27 @@
</span><span class="cx"> * Calculate the selector for the sidebar's widgets based on the registered sidebar's info
</span><span class="cx"> */
</span><span class="cx"> buildWidgetSelectors: function () {
</span><del>- $.each( self.registered_sidebars, function ( i, sidebar ) {
- var widget_tpl = [
</del><ins>+ var self = this;
+
+ $.each( this.registeredSidebars, function ( i, sidebar ) {
+ var widgetTpl = [
</ins><span class="cx"> sidebar.before_widget.replace('%1$s', '').replace('%2$s', ''),
</span><span class="cx"> sidebar.before_title,
</span><span class="cx"> sidebar.after_title,
</span><span class="cx"> sidebar.after_widget
</span><span class="cx"> ].join(''),
</span><del>- empty_widget,
- widget_selector,
- widget_classes;
</del><ins>+ emptyWidget,
+ widgetSelector,
+ widgetClasses;
</ins><span class="cx">
</span><del>- empty_widget = $(widget_tpl);
- widget_selector = empty_widget.prop('tagName');
- widget_classes = empty_widget.prop('className').replace(/^\s+|\s+$/g, '');
</del><ins>+ emptyWidget = $(widgetTpl);
+ widgetSelector = emptyWidget.prop('tagName');
+ widgetClasses = emptyWidget.prop('className').replace(/^\s+|\s+$/g, '');
</ins><span class="cx">
</span><del>- if ( widget_classes ) {
- widget_selector += '.' + widget_classes.split(/\s+/).join('.');
</del><ins>+ if ( widgetClasses ) {
+ widgetSelector += '.' + widgetClasses.split(/\s+/).join('.');
</ins><span class="cx"> }
</span><del>- self.widget_selectors.push(widget_selector);
</del><ins>+ self.widgetSelectors.push(widgetSelector);
</ins><span class="cx"> });
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -65,11 +74,10 @@
</span><span class="cx"> *
</span><span class="cx"> */
</span><span class="cx"> highlightControls: function() {
</span><ins>+ var selector = this.widgetSelectors.join(',');
</ins><span class="cx">
</span><del>- var selector = this.widget_selectors.join(',');
</del><ins>+ $(selector).attr( 'title', this.l10n.widgetTooltip );
</ins><span class="cx">
</span><del>- $(selector).attr( 'title', self.i18n.widget_tooltip );
-
</del><span class="cx"> $(document).on( 'mouseenter', selector, function () {
</span><span class="cx"> var control = parent.WidgetCustomizer.getWidgetFormControlForWidget( $(this).prop('id') );
</span><span class="cx"> if ( control ) {
</span><span class="lines">@@ -89,26 +97,28 @@
</span><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx"> }
</span><del>-
</del><span class="cx"> };
</span><span class="cx">
</span><del>- $.extend(self, WidgetCustomizerPreview_exports);
-
</del><span class="cx"> /**
</span><span class="cx"> * Capture the instance of the Preview since it is private
</span><span class="cx"> */
</span><del>- OldPreview = wp.customize.Preview;
- wp.customize.Preview = OldPreview.extend( {
</del><ins>+ OldPreview = api.Preview;
+ api.Preview = OldPreview.extend( {
</ins><span class="cx"> initialize: function( params, options ) {
</span><del>- self.preview = this;
</del><ins>+ api.WidgetCustomizerPreview.preview = this;
</ins><span class="cx"> OldPreview.prototype.initialize.call( this, params, options );
</span><span class="cx"> }
</span><span class="cx"> } );
</span><span class="cx">
</span><del>- // @todo on customize ready?
</del><span class="cx"> $(function () {
</span><del>- self.init();
</del><ins>+ var settings = window._wpWidgetCustomizerPreviewSettings;
+ if ( ! settings ) {
+ return;
+ }
+
+ $.extend( api.WidgetCustomizerPreview, settings );
+
+ api.WidgetCustomizerPreview.init();
</ins><span class="cx"> });
</span><span class="cx">
</span><del>- return self;
-}( jQuery ));
</del><ins>+})( jQuery, window.wp );
</ins></span></pre>
</div>
</div>
</body>
</html>