Changeset 29048

Timestamp:

07/09/2014 08:57:58 PM (11 years ago)

Author:

SergeyBiryukov

Message:

Customizer: Export Previewer instance to wp.customize.previewer, and utilize for Widget Customizer.

props westonruter.
fixes #27666.

Location:

trunk/src/wp-admin/js

Files:

• customize-controls.js (modified) (7 diffs)
• customize-widgets.js (modified) (9 diffs)

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

@@ -914 +914 @@
             return window.location = api.settings.url.fallback;
 
-        var previewer, parent, topFocus,
+        var parent, topFocus,
             body = $( document.body ),
             overlay = body.children( '.wp-full-overlay' ),
@@ -932 +932 @@
 
         // Initialize Previewer
-        previewer = new api.Previewer({
+        api.previewer = new api.Previewer({
             container:   '#customize-preview',
             form:        '#customize-controls',
@@ -1009 +1009 @@
 
         // Refresh the nonces if the preview sends updated nonces over.
-        previewer.bind( 'nonce', function( nonce ) {
+        api.previewer.bind( 'nonce', function( nonce ) {
             $.extend( this.nonce, nonce );
         });
@@ -1016 +1016 @@
             api.create( id, id, data.value, {
                 transport: data.transport,
-                previewer: previewer
+                previewer: api.previewer
             } );
         });
@@ -1026 +1026 @@
             control = api.control.add( id, new constructor( id, {
                 params: data,
-                previewer: previewer
+                previewer: api.previewer
             } ) );
         });
 
         // Check if preview url is valid and load the preview frame.
-        if ( previewer.previewUrl() )
-            previewer.refresh();
-        else
-            previewer.previewUrl( api.settings.url.home );
+        if ( api.previewer.previewUrl() ) {
+            api.previewer.refresh();
+        } else {
+            api.previewer.previewUrl( api.settings.url.home );
+        }
 
         // Save and activated states
@@ -1083 +1084 @@
         // Button bindings.
         saveBtn.click( function( event ) {
-            previewer.save();
+            api.previewer.save();
             event.preventDefault();
         }).keydown( function( event ) {
@@ -1089 +1090 @@
                 return;
             if ( 13 === event.which ) // enter
-                previewer.save();
+                api.previewer.save();
             event.preventDefault();
         });

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

@@ -6 +6 @@
     // Set up our namespace...
     var api = wp.customize,
-        l10n, OldPreviewer;
+        l10n;
 
     api.Widgets = api.Widgets || {};
@@ -186 +186 @@
 
             // Close the panel if the URL in the preview changes
-            api.Widgets.Previewer.bind( 'url', this.close );
+            api.previewer.bind( 'url', this.close );
         },
 
@@ -746 +746 @@
             } );
 
-            api.Widgets.Previewer.bind( 'widget-updated', function( updatedWidgetId ) {
+            api.previewer.bind( 'widget-updated', function( updatedWidgetId ) {
                 if ( updatedWidgetId === self.params.widget_id ) {
                     self.container.removeClass( 'previewer-loading' );
@@ -753 +753 @@
 
             // Update widget control to indicate whether it is currently rendered
-            api.Widgets.Previewer.bind( 'rendered-widgets', function( renderedWidgets ) {
+            api.previewer.bind( 'rendered-widgets', function( renderedWidgets ) {
                 var isRendered = !! renderedWidgets[self.params.widget_id];
 
@@ -972 +972 @@
                 // Check if the user is logged out.
                 if ( '0' === r ) {
-                    api.Widgets.Previewer.preview.iframe.hide();
-                    api.Widgets.Previewer.login().done( function() {
+                    api.previewer.preview.iframe.hide();
+                    api.previewer.login().done( function() {
                         self.updateWidget( args );
-                        api.Widgets.Previewer.preview.iframe.show();
+                        api.previewer.preview.iframe.show();
                     } );
                     return;
@@ -982 +982 @@
                 // Check for cheaters.
                 if ( '-1' === r ) {
-                    api.Widgets.Previewer.cheatin();
+                    api.previewer.cheatin();
                     return;
                 }
@@ -1419 +1419 @@
 
             // Update the model with whether or not the sidebar is rendered
-            api.Widgets.Previewer.bind( 'rendered-sidebars', function( renderedSidebars ) {
+            api.previewer.bind( 'rendered-sidebars', function( renderedSidebars ) {
                 var isRendered = !! renderedSidebars[self.params.sidebar_id];
 
@@ -1740 +1740 @@
 
     /**
-     * Capture the instance of the Previewer since it is private
-     */
-    OldPreviewer = api.Previewer;
-    api.Previewer = OldPreviewer.extend({
-        initialize: function( params, options ) {
-            api.Widgets.Previewer = this;
-            OldPreviewer.prototype.initialize.call( this, params, options );
-            this.bind( 'refresh', this.refresh );
-        }
-    } );
-
-    /**
      * Init Customizer for widgets.
      */
@@ -1761 +1749 @@
 
         // Highlight widget control
-        api.Widgets.Previewer.bind( 'highlight-widget-control', api.Widgets.highlightWidgetFormControl );
+        api.previewer.bind( 'highlight-widget-control', api.Widgets.highlightWidgetFormControl );
 
         // Open and focus widget control
-        api.Widgets.Previewer.bind( 'focus-widget-control', api.Widgets.focusWidgetFormControl );
+        api.previewer.bind( 'focus-widget-control', api.Widgets.focusWidgetFormControl );
     } );