]> scripts.mit.edu Git - autoinstalls/wordpress.git/blobdiff - wp-admin/js/customize-controls.js
WordPress 4.7.1
[autoinstalls/wordpress.git] / wp-admin / js / customize-controls.js
index 3a05ad437f74a084943d1babaff828feca65792f..e6270ee0e6b3f02617e6682780082df12bc82907 100644 (file)
+/* global _wpCustomizeHeader, _wpCustomizeBackground, _wpMediaViewsL10n, MediaElementPlayer */
 (function( exports, $ ){
-       var api = wp.customize;
+       var Container, focus, normalizedTransitionendEventName, api = wp.customize;
 
        /**
-        * @param options
-        * - previewer - The Previewer instance to sync with.
-        * - transport - The transport to use for previewing. Supports 'refresh' and 'postMessage'.
+        * A Customizer Setting.
+        *
+        * A setting is WordPress data (theme mod, option, menu, etc.) that the user can
+        * draft changes to in the Customizer.
+        *
+        * @see PHP class WP_Customize_Setting.
+        *
+        * @class
+        * @augments wp.customize.Value
+        * @augments wp.customize.Class
+        *
+        * @param {object} id                The Setting ID.
+        * @param {object} value             The initial value of the setting.
+        * @param {object} options.previewer The Previewer instance to sync with.
+        * @param {object} options.transport The transport to use for previewing. Supports 'refresh' and 'postMessage'.
+        * @param {object} options.dirty
         */
        api.Setting = api.Value.extend({
                initialize: function( id, value, options ) {
-                       api.Value.prototype.initialize.call( this, value, options );
+                       var setting = this;
+                       api.Value.prototype.initialize.call( setting, value, options );
 
-                       this.id = id;
-                       this.transport = this.transport || 'refresh';
+                       setting.id = id;
+                       setting.transport = setting.transport || 'refresh';
+                       setting._dirty = options.dirty || false;
+                       setting.notifications = new api.Values({ defaultConstructor: api.Notification });
 
-                       this.bind( this.preview );
+                       // Whenever the setting's value changes, refresh the preview.
+                       setting.bind( setting.preview );
                },
+
+               /**
+                * Refresh the preview, respective of the setting's refresh policy.
+                *
+                * If the preview hasn't sent a keep-alive message and is likely
+                * disconnected by having navigated to a non-allowed URL, then the
+                * refresh transport will be forced when postMessage is the transport.
+                * Note that postMessage does not throw an error when the recipient window
+                * fails to match the origin window, so using try/catch around the
+                * previewer.send() call to then fallback to refresh will not work.
+                *
+                * @since 3.4.0
+                * @access public
+                *
+                * @returns {void}
+                */
                preview: function() {
-                       switch ( this.transport ) {
-                               case 'refresh':
-                                       return this.previewer.refresh();
-                               case 'postMessage':
-                                       return this.previewer.send( 'setting', [ this.id, this() ] );
+                       var setting = this, transport;
+                       transport = setting.transport;
+
+                       if ( 'postMessage' === transport && ! api.state( 'previewerAlive' ).get() ) {
+                               transport = 'refresh';
+                       }
+
+                       if ( 'postMessage' === transport ) {
+                               setting.previewer.send( 'setting', [ setting.id, setting() ] );
+                       } else if ( 'refresh' === transport ) {
+                               setting.previewer.refresh();
+                       }
+               },
+
+               /**
+                * Find controls associated with this setting.
+                *
+                * @since 4.6.0
+                * @returns {wp.customize.Control[]} Controls associated with setting.
+                */
+               findControls: function() {
+                       var setting = this, controls = [];
+                       api.control.each( function( control ) {
+                               _.each( control.settings, function( controlSetting ) {
+                                       if ( controlSetting.id === setting.id ) {
+                                               controls.push( control );
+                                       }
+                               } );
+                       } );
+                       return controls;
+               }
+       });
+
+       /**
+        * Current change count.
+        *
+        * @since 4.7.0
+        * @type {number}
+        * @protected
+        */
+       api._latestRevision = 0;
+
+       /**
+        * Last revision that was saved.
+        *
+        * @since 4.7.0
+        * @type {number}
+        * @protected
+        */
+       api._lastSavedRevision = 0;
+
+       /**
+        * Latest revisions associated with the updated setting.
+        *
+        * @since 4.7.0
+        * @type {object}
+        * @protected
+        */
+       api._latestSettingRevisions = {};
+
+       /*
+        * Keep track of the revision associated with each updated setting so that
+        * requestChangesetUpdate knows which dirty settings to include. Also, once
+        * ready is triggered and all initial settings have been added, increment
+        * revision for each newly-created initially-dirty setting so that it will
+        * also be included in changeset update requests.
+        */
+       api.bind( 'change', function incrementChangedSettingRevision( setting ) {
+               api._latestRevision += 1;
+               api._latestSettingRevisions[ setting.id ] = api._latestRevision;
+       } );
+       api.bind( 'ready', function() {
+               api.bind( 'add', function incrementCreatedSettingRevision( setting ) {
+                       if ( setting._dirty ) {
+                               api._latestRevision += 1;
+                               api._latestSettingRevisions[ setting.id ] = api._latestRevision;
+                       }
+               } );
+       } );
+
+       /**
+        * Get the dirty setting values.
+        *
+        * @since 4.7.0
+        * @access public
+        *
+        * @param {object} [options] Options.
+        * @param {boolean} [options.unsaved=false] Whether only values not saved yet into a changeset will be returned (differential changes).
+        * @returns {object} Dirty setting values.
+        */
+       api.dirtyValues = function dirtyValues( options ) {
+               var values = {};
+               api.each( function( setting ) {
+                       var settingRevision;
+
+                       if ( ! setting._dirty ) {
+                               return;
+                       }
+
+                       settingRevision = api._latestSettingRevisions[ setting.id ];
+
+                       // Skip including settings that have already been included in the changeset, if only requesting unsaved.
+                       if ( api.state( 'changesetStatus' ).get() && ( options && options.unsaved ) && ( _.isUndefined( settingRevision ) || settingRevision <= api._lastSavedRevision ) ) {
+                               return;
+                       }
+
+                       values[ setting.id ] = setting.get();
+               } );
+               return values;
+       };
+
+       /**
+        * Request updates to the changeset.
+        *
+        * @since 4.7.0
+        * @access public
+        *
+        * @param {object} [changes] Mapping of setting IDs to setting params each normally including a value property, or mapping to null.
+        *                           If not provided, then the changes will still be obtained from unsaved dirty settings.
+        * @returns {jQuery.Promise} Promise resolving with the response data.
+        */
+       api.requestChangesetUpdate = function requestChangesetUpdate( changes ) {
+               var deferred, request, submittedChanges = {}, data;
+               deferred = new $.Deferred();
+
+               if ( changes ) {
+                       _.extend( submittedChanges, changes );
+               }
+
+               // Ensure all revised settings (changes pending save) are also included, but not if marked for deletion in changes.
+               _.each( api.dirtyValues( { unsaved: true } ), function( dirtyValue, settingId ) {
+                       if ( ! changes || null !== changes[ settingId ] ) {
+                               submittedChanges[ settingId ] = _.extend(
+                                       {},
+                                       submittedChanges[ settingId ] || {},
+                                       { value: dirtyValue }
+                               );
+                       }
+               } );
+
+               // Short-circuit when there are no pending changes.
+               if ( _.isEmpty( submittedChanges ) ) {
+                       deferred.resolve( {} );
+                       return deferred.promise();
+               }
+
+               // Make sure that publishing a changeset waits for all changeset update requests to complete.
+               api.state( 'processing' ).set( api.state( 'processing' ).get() + 1 );
+               deferred.always( function() {
+                       api.state( 'processing' ).set( api.state( 'processing' ).get() - 1 );
+               } );
+
+               // Allow plugins to attach additional params to the settings.
+               api.trigger( 'changeset-save', submittedChanges );
+
+               // Ensure that if any plugins add data to save requests by extending query() that they get included here.
+               data = api.previewer.query( { excludeCustomizedSaved: true } );
+               delete data.customized; // Being sent in customize_changeset_data instead.
+               _.extend( data, {
+                       nonce: api.settings.nonce.save,
+                       customize_theme: api.settings.theme.stylesheet,
+                       customize_changeset_data: JSON.stringify( submittedChanges )
+               } );
+
+               request = wp.ajax.post( 'customize_save', data );
+
+               request.done( function requestChangesetUpdateDone( data ) {
+                       var savedChangesetValues = {};
+
+                       // Ensure that all settings updated subsequently will be included in the next changeset update request.
+                       api._lastSavedRevision = Math.max( api._latestRevision, api._lastSavedRevision );
+
+                       api.state( 'changesetStatus' ).set( data.changeset_status );
+                       deferred.resolve( data );
+                       api.trigger( 'changeset-saved', data );
+
+                       if ( data.setting_validities ) {
+                               _.each( data.setting_validities, function( validity, settingId ) {
+                                       if ( true === validity && _.isObject( submittedChanges[ settingId ] ) && ! _.isUndefined( submittedChanges[ settingId ].value ) ) {
+                                               savedChangesetValues[ settingId ] = submittedChanges[ settingId ].value;
+                                       }
+                               } );
+                       }
+
+                       api.previewer.send( 'changeset-saved', _.extend( {}, data, { saved_changeset_values: savedChangesetValues } ) );
+               } );
+               request.fail( function requestChangesetUpdateFail( data ) {
+                       deferred.reject( data );
+                       api.trigger( 'changeset-error', data );
+               } );
+               request.always( function( data ) {
+                       if ( data.setting_validities ) {
+                               api._handleSettingValidities( {
+                                       settingValidities: data.setting_validities
+                               } );
+                       }
+               } );
+
+               return deferred.promise();
+       };
+
+       /**
+        * Watch all changes to Value properties, and bubble changes to parent Values instance
+        *
+        * @since 4.1.0
+        *
+        * @param {wp.customize.Class} instance
+        * @param {Array}              properties  The names of the Value instances to watch.
+        */
+       api.utils.bubbleChildValueChanges = function ( instance, properties ) {
+               $.each( properties, function ( i, key ) {
+                       instance[ key ].bind( function ( to, from ) {
+                               if ( instance.parent && to !== from ) {
+                                       instance.parent.trigger( 'change', instance );
+                               }
+                       } );
+               } );
+       };
+
+       /**
+        * Expand a panel, section, or control and focus on the first focusable element.
+        *
+        * @since 4.1.0
+        *
+        * @param {Object}   [params]
+        * @param {Function} [params.completeCallback]
+        */
+       focus = function ( params ) {
+               var construct, completeCallback, focus, focusElement;
+               construct = this;
+               params = params || {};
+               focus = function () {
+                       var focusContainer;
+                       if ( ( construct.extended( api.Panel ) || construct.extended( api.Section ) ) && construct.expanded && construct.expanded() ) {
+                               focusContainer = construct.contentContainer;
+                       } else {
+                               focusContainer = construct.container;
+                       }
+
+                       focusElement = focusContainer.find( '.control-focus:first' );
+                       if ( 0 === focusElement.length ) {
+                               // Note that we can't use :focusable due to a jQuery UI issue. See: https://github.com/jquery/jquery-ui/pull/1583
+                               focusElement = focusContainer.find( 'input, select, textarea, button, object, a[href], [tabindex]' ).filter( ':visible' ).first();
+                       }
+                       focusElement.focus();
+               };
+               if ( params.completeCallback ) {
+                       completeCallback = params.completeCallback;
+                       params.completeCallback = function () {
+                               focus();
+                               completeCallback();
+                       };
+               } else {
+                       params.completeCallback = focus;
+               }
+
+               api.state( 'paneVisible' ).set( true );
+               if ( construct.expand ) {
+                       construct.expand( params );
+               } else {
+                       params.completeCallback();
+               }
+       };
+
+       /**
+        * Stable sort for Panels, Sections, and Controls.
+        *
+        * If a.priority() === b.priority(), then sort by their respective params.instanceNumber.
+        *
+        * @since 4.1.0
+        *
+        * @param {(wp.customize.Panel|wp.customize.Section|wp.customize.Control)} a
+        * @param {(wp.customize.Panel|wp.customize.Section|wp.customize.Control)} b
+        * @returns {Number}
+        */
+       api.utils.prioritySort = function ( a, b ) {
+               if ( a.priority() === b.priority() && typeof a.params.instanceNumber === 'number' && typeof b.params.instanceNumber === 'number' ) {
+                       return a.params.instanceNumber - b.params.instanceNumber;
+               } else {
+                       return a.priority() - b.priority();
+               }
+       };
+
+       /**
+        * Return whether the supplied Event object is for a keydown event but not the Enter key.
+        *
+        * @since 4.1.0
+        *
+        * @param {jQuery.Event} event
+        * @returns {boolean}
+        */
+       api.utils.isKeydownButNotEnterEvent = function ( event ) {
+               return ( 'keydown' === event.type && 13 !== event.which );
+       };
+
+       /**
+        * Return whether the two lists of elements are the same and are in the same order.
+        *
+        * @since 4.1.0
+        *
+        * @param {Array|jQuery} listA
+        * @param {Array|jQuery} listB
+        * @returns {boolean}
+        */
+       api.utils.areElementListsEqual = function ( listA, listB ) {
+               var equal = (
+                       listA.length === listB.length && // if lists are different lengths, then naturally they are not equal
+                       -1 === _.indexOf( _.map( // are there any false values in the list returned by map?
+                               _.zip( listA, listB ), // pair up each element between the two lists
+                               function ( pair ) {
+                                       return $( pair[0] ).is( pair[1] ); // compare to see if each pair are equal
+                               }
+                       ), false ) // check for presence of false in map's return value
+               );
+               return equal;
+       };
+
+       /**
+        * Return browser supported `transitionend` event name.
+        *
+        * @since 4.7.0
+        *
+        * @returns {string|null} Normalized `transitionend` event name or null if CSS transitions are not supported.
+        */
+       normalizedTransitionendEventName = (function () {
+               var el, transitions, prop;
+               el = document.createElement( 'div' );
+               transitions = {
+                       'transition'      : 'transitionend',
+                       'OTransition'     : 'oTransitionEnd',
+                       'MozTransition'   : 'transitionend',
+                       'WebkitTransition': 'webkitTransitionEnd'
+               };
+               prop = _.find( _.keys( transitions ), function( prop ) {
+                       return ! _.isUndefined( el.style[ prop ] );
+               } );
+               if ( prop ) {
+                       return transitions[ prop ];
+               } else {
+                       return null;
+               }
+       })();
+
+       /**
+        * Base class for Panel and Section.
+        *
+        * @since 4.1.0
+        *
+        * @class
+        * @augments wp.customize.Class
+        */
+       Container = api.Class.extend({
+               defaultActiveArguments: { duration: 'fast', completeCallback: $.noop },
+               defaultExpandedArguments: { duration: 'fast', completeCallback: $.noop },
+               containerType: 'container',
+               defaults: {
+                       title: '',
+                       description: '',
+                       priority: 100,
+                       type: 'default',
+                       content: null,
+                       active: true,
+                       instanceNumber: null
+               },
+
+               /**
+                * @since 4.1.0
+                *
+                * @param {string}         id - The ID for the container.
+                * @param {object}         options - Object containing one property: params.
+                * @param {object}         options.params - Object containing the following properties.
+                * @param {string}         options.params.title - Title shown when panel is collapsed and expanded.
+                * @param {string=}        [options.params.description] - Description shown at the top of the panel.
+                * @param {number=100}     [options.params.priority] - The sort priority for the panel.
+                * @param {string=default} [options.params.type] - The type of the panel. See wp.customize.panelConstructor.
+                * @param {string=}        [options.params.content] - The markup to be used for the panel container. If empty, a JS template is used.
+                * @param {boolean=true}   [options.params.active] - Whether the panel is active or not.
+                */
+               initialize: function ( id, options ) {
+                       var container = this;
+                       container.id = id;
+                       options = options || {};
+
+                       options.params = _.defaults(
+                               options.params || {},
+                               container.defaults
+                       );
+
+                       $.extend( container, options );
+                       container.templateSelector = 'customize-' + container.containerType + '-' + container.params.type;
+                       container.container = $( container.params.content );
+                       if ( 0 === container.container.length ) {
+                               container.container = $( container.getContainer() );
+                       }
+                       container.headContainer = container.container;
+                       container.contentContainer = container.getContent();
+                       container.container = container.container.add( container.contentContainer );
+
+                       container.deferred = {
+                               embedded: new $.Deferred()
+                       };
+                       container.priority = new api.Value();
+                       container.active = new api.Value();
+                       container.activeArgumentsQueue = [];
+                       container.expanded = new api.Value();
+                       container.expandedArgumentsQueue = [];
+
+                       container.active.bind( function ( active ) {
+                               var args = container.activeArgumentsQueue.shift();
+                               args = $.extend( {}, container.defaultActiveArguments, args );
+                               active = ( active && container.isContextuallyActive() );
+                               container.onChangeActive( active, args );
+                       });
+                       container.expanded.bind( function ( expanded ) {
+                               var args = container.expandedArgumentsQueue.shift();
+                               args = $.extend( {}, container.defaultExpandedArguments, args );
+                               container.onChangeExpanded( expanded, args );
+                       });
+
+                       container.deferred.embedded.done( function () {
+                               container.attachEvents();
+                       });
+
+                       api.utils.bubbleChildValueChanges( container, [ 'priority', 'active' ] );
+
+                       container.priority.set( container.params.priority );
+                       container.active.set( container.params.active );
+                       container.expanded.set( false );
+               },
+
+               /**
+                * @since 4.1.0
+                *
+                * @abstract
+                */
+               ready: function() {},
+
+               /**
+                * Get the child models associated with this parent, sorting them by their priority Value.
+                *
+                * @since 4.1.0
+                *
+                * @param {String} parentType
+                * @param {String} childType
+                * @returns {Array}
+                */
+               _children: function ( parentType, childType ) {
+                       var parent = this,
+                               children = [];
+                       api[ childType ].each( function ( child ) {
+                               if ( child[ parentType ].get() === parent.id ) {
+                                       children.push( child );
+                               }
+                       } );
+                       children.sort( api.utils.prioritySort );
+                       return children;
+               },
+
+               /**
+                * To override by subclass, to return whether the container has active children.
+                *
+                * @since 4.1.0
+                *
+                * @abstract
+                */
+               isContextuallyActive: function () {
+                       throw new Error( 'Container.isContextuallyActive() must be overridden in a subclass.' );
+               },
+
+               /**
+                * Active state change handler.
+                *
+                * Shows the container if it is active, hides it if not.
+                *
+                * To override by subclass, update the container's UI to reflect the provided active state.
+                *
+                * @since 4.1.0
+                *
+                * @param {Boolean} active
+                * @param {Object}  args
+                * @param {Object}  args.duration
+                * @param {Object}  args.completeCallback
+                */
+               onChangeActive: function( active, args ) {
+                       var construct = this,
+                               headContainer = construct.headContainer,
+                               duration, expandedOtherPanel;
+
+                       if ( args.unchanged ) {
+                               if ( args.completeCallback ) {
+                                       args.completeCallback();
+                               }
+                               return;
+                       }
+
+                       duration = ( 'resolved' === api.previewer.deferred.active.state() ? args.duration : 0 );
+
+                       if ( construct.extended( api.Panel ) ) {
+                               // If this is a panel is not currently expanded but another panel is expanded, do not animate.
+                               api.panel.each(function ( panel ) {
+                                       if ( panel !== construct && panel.expanded() ) {
+                                               expandedOtherPanel = panel;
+                                               duration = 0;
+                                       }
+                               });
+
+                               // Collapse any expanded sections inside of this panel first before deactivating.
+                               if ( ! active ) {
+                                       _.each( construct.sections(), function( section ) {
+                                               section.collapse( { duration: 0 } );
+                                       } );
+                               }
+                       }
+
+                       if ( ! $.contains( document, headContainer ) ) {
+                               // jQuery.fn.slideUp is not hiding an element if it is not in the DOM
+                               headContainer.toggle( active );
+                               if ( args.completeCallback ) {
+                                       args.completeCallback();
+                               }
+                       } else if ( active ) {
+                               headContainer.stop( true, true ).slideDown( duration, args.completeCallback );
+                       } else {
+                               if ( construct.expanded() ) {
+                                       construct.collapse({
+                                               duration: duration,
+                                               completeCallback: function() {
+                                                       headContainer.stop( true, true ).slideUp( duration, args.completeCallback );
+                                               }
+                                       });
+                               } else {
+                                       headContainer.stop( true, true ).slideUp( duration, args.completeCallback );
+                               }
+                       }
+               },
+
+               /**
+                * @since 4.1.0
+                *
+                * @params {Boolean} active
+                * @param {Object}   [params]
+                * @returns {Boolean} false if state already applied
+                */
+               _toggleActive: function ( active, params ) {
+                       var self = this;
+                       params = params || {};
+                       if ( ( active && this.active.get() ) || ( ! active && ! this.active.get() ) ) {
+                               params.unchanged = true;
+                               self.onChangeActive( self.active.get(), params );
+                               return false;
+                       } else {
+                               params.unchanged = false;
+                               this.activeArgumentsQueue.push( params );
+                               this.active.set( active );
+                               return true;
+                       }
+               },
+
+               /**
+                * @param {Object} [params]
+                * @returns {Boolean} false if already active
+                */
+               activate: function ( params ) {
+                       return this._toggleActive( true, params );
+               },
+
+               /**
+                * @param {Object} [params]
+                * @returns {Boolean} false if already inactive
+                */
+               deactivate: function ( params ) {
+                       return this._toggleActive( false, params );
+               },
+
+               /**
+                * To override by subclass, update the container's UI to reflect the provided active state.
+                * @abstract
+                */
+               onChangeExpanded: function () {
+                       throw new Error( 'Must override with subclass.' );
+               },
+
+               /**
+                * Handle the toggle logic for expand/collapse.
+                *
+                * @param {Boolean}  expanded - The new state to apply.
+                * @param {Object}   [params] - Object containing options for expand/collapse.
+                * @param {Function} [params.completeCallback] - Function to call when expansion/collapse is complete.
+                * @returns {Boolean} false if state already applied or active state is false
+                */
+               _toggleExpanded: function( expanded, params ) {
+                       var instance = this, previousCompleteCallback;
+                       params = params || {};
+                       previousCompleteCallback = params.completeCallback;
+
+                       // Short-circuit expand() if the instance is not active.
+                       if ( expanded && ! instance.active() ) {
+                               return false;
+                       }
+
+                       api.state( 'paneVisible' ).set( true );
+                       params.completeCallback = function() {
+                               if ( previousCompleteCallback ) {
+                                       previousCompleteCallback.apply( instance, arguments );
+                               }
+                               if ( expanded ) {
+                                       instance.container.trigger( 'expanded' );
+                               } else {
+                                       instance.container.trigger( 'collapsed' );
+                               }
+                       };
+                       if ( ( expanded && instance.expanded.get() ) || ( ! expanded && ! instance.expanded.get() ) ) {
+                               params.unchanged = true;
+                               instance.onChangeExpanded( instance.expanded.get(), params );
+                               return false;
+                       } else {
+                               params.unchanged = false;
+                               instance.expandedArgumentsQueue.push( params );
+                               instance.expanded.set( expanded );
+                               return true;
+                       }
+               },
+
+               /**
+                * @param {Object} [params]
+                * @returns {Boolean} false if already expanded or if inactive.
+                */
+               expand: function ( params ) {
+                       return this._toggleExpanded( true, params );
+               },
+
+               /**
+                * @param {Object} [params]
+                * @returns {Boolean} false if already collapsed.
+                */
+               collapse: function ( params ) {
+                       return this._toggleExpanded( false, params );
+               },
+
+               /**
+                * Animate container state change if transitions are supported by the browser.
+                *
+                * @since 4.7.0
+                * @private
+                *
+                * @param {function} completeCallback Function to be called after transition is completed.
+                * @returns {void}
+                */
+               _animateChangeExpanded: function( completeCallback ) {
+                       // Return if CSS transitions are not supported.
+                       if ( ! normalizedTransitionendEventName ) {
+                               if ( completeCallback ) {
+                                       completeCallback();
+                               }
+                               return;
+                       }
+
+                       var construct = this,
+                               content = construct.contentContainer,
+                               overlay = content.closest( '.wp-full-overlay' ),
+                               elements, transitionEndCallback;
+
+                       // Determine set of elements that are affected by the animation.
+                       elements = overlay.add( content );
+                       if ( _.isUndefined( construct.panel ) || '' === construct.panel() ) {
+                               elements = elements.add( '#customize-info, .customize-pane-parent' );
+                       }
+
+                       // Handle `transitionEnd` event.
+                       transitionEndCallback = function( e ) {
+                               if ( 2 !== e.eventPhase || ! $( e.target ).is( content ) ) {
+                                       return;
+                               }
+                               content.off( normalizedTransitionendEventName, transitionEndCallback );
+                               elements.removeClass( 'busy' );
+                               if ( completeCallback ) {
+                                       completeCallback();
+                               }
+                       };
+                       content.on( normalizedTransitionendEventName, transitionEndCallback );
+                       elements.addClass( 'busy' );
+
+                       // Prevent screen flicker when pane has been scrolled before expanding.
+                       _.defer( function() {
+                               var container = content.closest( '.wp-full-overlay-sidebar-content' ),
+                                       currentScrollTop = container.scrollTop(),
+                                       previousScrollTop = content.data( 'previous-scrollTop' ) || 0,
+                                       expanded = construct.expanded();
+
+                               if ( expanded && 0 < currentScrollTop ) {
+                                       content.css( 'top', currentScrollTop + 'px' );
+                                       content.data( 'previous-scrollTop', currentScrollTop );
+                               } else if ( ! expanded && 0 < currentScrollTop + previousScrollTop ) {
+                                       content.css( 'top', previousScrollTop - currentScrollTop + 'px' );
+                                       container.scrollTop( previousScrollTop );
+                               }
+                       } );
+               },
+
+               /**
+                * Bring the container into view and then expand this and bring it into view
+                * @param {Object} [params]
+                */
+               focus: focus,
+
+               /**
+                * Return the container html, generated from its JS template, if it exists.
+                *
+                * @since 4.3.0
+                */
+               getContainer: function () {
+                       var template,
+                               container = this;
+
+                       if ( 0 !== $( '#tmpl-' + container.templateSelector ).length ) {
+                               template = wp.template( container.templateSelector );
+                       } else {
+                               template = wp.template( 'customize-' + container.containerType + '-default' );
+                       }
+                       if ( template && container.container ) {
+                               return $.trim( template( container.params ) );
+                       }
+
+                       return '<li></li>';
+               },
+
+               /**
+                * Find content element which is displayed when the section is expanded.
+                *
+                * After a construct is initialized, the return value will be available via the `contentContainer` property.
+                * By default the element will be related it to the parent container with `aria-owns` and detached.
+                * Custom panels and sections (such as the `NewMenuSection`) that do not have a sliding pane should
+                * just return the content element without needing to add the `aria-owns` element or detach it from
+                * the container. Such non-sliding pane custom sections also need to override the `onChangeExpanded`
+                * method to handle animating the panel/section into and out of view.
+                *
+                * @since 4.7.0
+                * @access public
+                *
+                * @returns {jQuery} Detached content element.
+                */
+               getContent: function() {
+                       var construct = this,
+                               container = construct.container,
+                               content = container.find( '.accordion-section-content, .control-panel-content' ).first(),
+                               contentId = 'sub-' + container.attr( 'id' ),
+                               ownedElements = contentId,
+                               alreadyOwnedElements = container.attr( 'aria-owns' );
+
+                       if ( alreadyOwnedElements ) {
+                               ownedElements = ownedElements + ' ' + alreadyOwnedElements;
+                       }
+                       container.attr( 'aria-owns', ownedElements );
+
+                       return content.detach().attr( {
+                               'id': contentId,
+                               'class': 'customize-pane-child ' + content.attr( 'class' ) + ' ' + container.attr( 'class' )
+                       } );
+               }
+       });
+
+       /**
+        * @since 4.1.0
+        *
+        * @class
+        * @augments wp.customize.Class
+        */
+       api.Section = Container.extend({
+               containerType: 'section',
+               defaults: {
+                       title: '',
+                       description: '',
+                       priority: 100,
+                       type: 'default',
+                       content: null,
+                       active: true,
+                       instanceNumber: null,
+                       panel: null,
+                       customizeAction: ''
+               },
+
+               /**
+                * @since 4.1.0
+                *
+                * @param {string}         id - The ID for the section.
+                * @param {object}         options - Object containing one property: params.
+                * @param {object}         options.params - Object containing the following properties.
+                * @param {string}         options.params.title - Title shown when section is collapsed and expanded.
+                * @param {string=}        [options.params.description] - Description shown at the top of the section.
+                * @param {number=100}     [options.params.priority] - The sort priority for the section.
+                * @param {string=default} [options.params.type] - The type of the section. See wp.customize.sectionConstructor.
+                * @param {string=}        [options.params.content] - The markup to be used for the section container. If empty, a JS template is used.
+                * @param {boolean=true}   [options.params.active] - Whether the section is active or not.
+                * @param {string}         options.params.panel - The ID for the panel this section is associated with.
+                * @param {string=}        [options.params.customizeAction] - Additional context information shown before the section title when expanded.
+                */
+               initialize: function ( id, options ) {
+                       var section = this;
+                       Container.prototype.initialize.call( section, id, options );
+
+                       section.id = id;
+                       section.panel = new api.Value();
+                       section.panel.bind( function ( id ) {
+                               $( section.headContainer ).toggleClass( 'control-subsection', !! id );
+                       });
+                       section.panel.set( section.params.panel || '' );
+                       api.utils.bubbleChildValueChanges( section, [ 'panel' ] );
+
+                       section.embed();
+                       section.deferred.embedded.done( function () {
+                               section.ready();
+                       });
+               },
+
+               /**
+                * Embed the container in the DOM when any parent panel is ready.
+                *
+                * @since 4.1.0
+                */
+               embed: function () {
+                       var inject,
+                               section = this,
+                               container = $( '#customize-theme-controls' );
+
+                       // Watch for changes to the panel state
+                       inject = function ( panelId ) {
+                               var parentContainer;
+                               if ( panelId ) {
+                                       // The panel has been supplied, so wait until the panel object is registered
+                                       api.panel( panelId, function ( panel ) {
+                                               // The panel has been registered, wait for it to become ready/initialized
+                                               panel.deferred.embedded.done( function () {
+                                                       parentContainer = panel.contentContainer;
+                                                       if ( ! section.headContainer.parent().is( parentContainer ) ) {
+                                                               parentContainer.append( section.headContainer );
+                                                       }
+                                                       if ( ! section.contentContainer.parent().is( section.headContainer ) ) {
+                                                               container.append( section.contentContainer );
+                                                       }
+                                                       section.deferred.embedded.resolve();
+                                               });
+                                       } );
+                               } else {
+                                       // There is no panel, so embed the section in the root of the customizer
+                                       parentContainer = $( '.customize-pane-parent' ); // @todo This should be defined elsewhere, and to be configurable
+                                       if ( ! section.headContainer.parent().is( parentContainer ) ) {
+                                               parentContainer.append( section.headContainer );
+                                       }
+                                       if ( ! section.contentContainer.parent().is( section.headContainer ) ) {
+                                               container.append( section.contentContainer );
+                                       }
+                                       section.deferred.embedded.resolve();
+                               }
+                       };
+                       section.panel.bind( inject );
+                       inject( section.panel.get() ); // Since a section may never get a panel, assume that it won't ever get one
+               },
+
+               /**
+                * Add behaviors for the accordion section.
+                *
+                * @since 4.1.0
+                */
+               attachEvents: function () {
+                       var meta, content, section = this;
+
+                       if ( section.container.hasClass( 'cannot-expand' ) ) {
+                               return;
+                       }
+
+                       // Expand/Collapse accordion sections on click.
+                       section.container.find( '.accordion-section-title, .customize-section-back' ).on( 'click keydown', function( event ) {
+                               if ( api.utils.isKeydownButNotEnterEvent( event ) ) {
+                                       return;
+                               }
+                               event.preventDefault(); // Keep this AFTER the key filter above
+
+                               if ( section.expanded() ) {
+                                       section.collapse();
+                               } else {
+                                       section.expand();
+                               }
+                       });
+
+                       // This is very similar to what is found for api.Panel.attachEvents().
+                       section.container.find( '.customize-section-title .customize-help-toggle' ).on( 'click', function() {
+
+                               meta = section.container.find( '.section-meta' );
+                               if ( meta.hasClass( 'cannot-expand' ) ) {
+                                       return;
+                               }
+                               content = meta.find( '.customize-section-description:first' );
+                               content.toggleClass( 'open' );
+                               content.slideToggle();
+                               content.attr( 'aria-expanded', function ( i, attr ) {
+                                       return 'true' === attr ? 'false' : 'true';
+                               });
+                       });
+               },
+
+               /**
+                * Return whether this section has any active controls.
+                *
+                * @since 4.1.0
+                *
+                * @returns {Boolean}
+                */
+               isContextuallyActive: function () {
+                       var section = this,
+                               controls = section.controls(),
+                               activeCount = 0;
+                       _( controls ).each( function ( control ) {
+                               if ( control.active() ) {
+                                       activeCount += 1;
+                               }
+                       } );
+                       return ( activeCount !== 0 );
+               },
+
+               /**
+                * Get the controls that are associated with this section, sorted by their priority Value.
+                *
+                * @since 4.1.0
+                *
+                * @returns {Array}
+                */
+               controls: function () {
+                       return this._children( 'section', 'control' );
+               },
+
+               /**
+                * Update UI to reflect expanded state.
+                *
+                * @since 4.1.0
+                *
+                * @param {Boolean} expanded
+                * @param {Object}  args
+                */
+               onChangeExpanded: function ( expanded, args ) {
+                       var section = this,
+                               container = section.headContainer.closest( '.wp-full-overlay-sidebar-content' ),
+                               content = section.contentContainer,
+                               overlay = section.headContainer.closest( '.wp-full-overlay' ),
+                               backBtn = content.find( '.customize-section-back' ),
+                               sectionTitle = section.headContainer.find( '.accordion-section-title' ).first(),
+                               expand;
+
+                       if ( expanded && ! content.hasClass( 'open' ) ) {
+
+                               if ( args.unchanged ) {
+                                       expand = args.completeCallback;
+                               } else {
+                                       expand = $.proxy( function() {
+                                               section._animateChangeExpanded( function() {
+                                                       sectionTitle.attr( 'tabindex', '-1' );
+                                                       backBtn.attr( 'tabindex', '0' );
+
+                                                       backBtn.focus();
+                                                       content.css( 'top', '' );
+                                                       container.scrollTop( 0 );
+
+                                                       if ( args.completeCallback ) {
+                                                               args.completeCallback();
+                                                       }
+                                               } );
+
+                                               content.addClass( 'open' );
+                                               overlay.addClass( 'section-open' );
+                                               api.state( 'expandedSection' ).set( section );
+                                       }, this );
+                               }
+
+                               if ( ! args.allowMultiple ) {
+                                       api.section.each( function ( otherSection ) {
+                                               if ( otherSection !== section ) {
+                                                       otherSection.collapse( { duration: args.duration } );
+                                               }
+                                       });
+                               }
+
+                               if ( section.panel() ) {
+                                       api.panel( section.panel() ).expand({
+                                               duration: args.duration,
+                                               completeCallback: expand
+                                       });
+                               } else {
+                                       api.panel.each( function( panel ) {
+                                               panel.collapse();
+                                       });
+                                       expand();
+                               }
+
+                       } else if ( ! expanded && content.hasClass( 'open' ) ) {
+                               section._animateChangeExpanded( function() {
+                                       backBtn.attr( 'tabindex', '-1' );
+                                       sectionTitle.attr( 'tabindex', '0' );
+
+                                       sectionTitle.focus();
+                                       content.css( 'top', '' );
+
+                                       if ( args.completeCallback ) {
+                                               args.completeCallback();
+                                       }
+                               } );
+
+                               content.removeClass( 'open' );
+                               overlay.removeClass( 'section-open' );
+                               if ( section === api.state( 'expandedSection' ).get() ) {
+                                       api.state( 'expandedSection' ).set( false );
+                               }
+
+                       } else {
+                               if ( args.completeCallback ) {
+                                       args.completeCallback();
+                               }
+                       }
+               }
+       });
+
+       /**
+        * wp.customize.ThemesSection
+        *
+        * Custom section for themes that functions similarly to a backwards panel,
+        * and also handles the theme-details view rendering and navigation.
+        *
+        * @constructor
+        * @augments wp.customize.Section
+        * @augments wp.customize.Container
+        */
+       api.ThemesSection = api.Section.extend({
+               currentTheme: '',
+               overlay: '',
+               template: '',
+               screenshotQueue: null,
+               $window: $( window ),
+
+               /**
+                * @since 4.2.0
+                */
+               initialize: function () {
+                       this.$customizeSidebar = $( '.wp-full-overlay-sidebar-content:first' );
+                       return api.Section.prototype.initialize.apply( this, arguments );
+               },
+
+               /**
+                * @since 4.2.0
+                */
+               ready: function () {
+                       var section = this;
+                       section.overlay = section.container.find( '.theme-overlay' );
+                       section.template = wp.template( 'customize-themes-details-view' );
+
+                       // Bind global keyboard events.
+                       section.container.on( 'keydown', function( event ) {
+                               if ( ! section.overlay.find( '.theme-wrap' ).is( ':visible' ) ) {
+                                       return;
+                               }
+
+                               // Pressing the right arrow key fires a theme:next event
+                               if ( 39 === event.keyCode ) {
+                                       section.nextTheme();
+                               }
+
+                               // Pressing the left arrow key fires a theme:previous event
+                               if ( 37 === event.keyCode ) {
+                                       section.previousTheme();
+                               }
+
+                               // Pressing the escape key fires a theme:collapse event
+                               if ( 27 === event.keyCode ) {
+                                       section.closeDetails();
+                                       event.stopPropagation(); // Prevent section from being collapsed.
+                               }
+                       });
+
+                       _.bindAll( this, 'renderScreenshots' );
+               },
+
+               /**
+                * Override Section.isContextuallyActive method.
+                *
+                * Ignore the active states' of the contained theme controls, and just
+                * use the section's own active state instead. This ensures empty search
+                * results for themes to cause the section to become inactive.
+                *
+                * @since 4.2.0
+                *
+                * @returns {Boolean}
+                */
+               isContextuallyActive: function () {
+                       return this.active();
+               },
+
+               /**
+                * @since 4.2.0
+                */
+               attachEvents: function () {
+                       var section = this;
+
+                       // Expand/Collapse section/panel.
+                       section.container.find( '.change-theme, .customize-theme' ).on( 'click keydown', function( event ) {
+                               if ( api.utils.isKeydownButNotEnterEvent( event ) ) {
+                                       return;
+                               }
+                               event.preventDefault(); // Keep this AFTER the key filter above
+
+                               if ( section.expanded() ) {
+                                       section.collapse();
+                               } else {
+                                       section.expand();
+                               }
+                       });
+
+                       // Theme navigation in details view.
+                       section.container.on( 'click keydown', '.left', function( event ) {
+                               if ( api.utils.isKeydownButNotEnterEvent( event ) ) {
+                                       return;
+                               }
+
+                               event.preventDefault(); // Keep this AFTER the key filter above
+
+                               section.previousTheme();
+                       });
+
+                       section.container.on( 'click keydown', '.right', function( event ) {
+                               if ( api.utils.isKeydownButNotEnterEvent( event ) ) {
+                                       return;
+                               }
+
+                               event.preventDefault(); // Keep this AFTER the key filter above
+
+                               section.nextTheme();
+                       });
+
+                       section.container.on( 'click keydown', '.theme-backdrop, .close', function( event ) {
+                               if ( api.utils.isKeydownButNotEnterEvent( event ) ) {
+                                       return;
+                               }
+
+                               event.preventDefault(); // Keep this AFTER the key filter above
+
+                               section.closeDetails();
+                       });
+
+                       var renderScreenshots = _.throttle( _.bind( section.renderScreenshots, this ), 100 );
+                       section.container.on( 'input', '#themes-filter', function( event ) {
+                               var count,
+                                       term = event.currentTarget.value.toLowerCase().trim().replace( '-', ' ' ),
+                                       controls = section.controls();
+
+                               _.each( controls, function( control ) {
+                                       control.filter( term );
+                               });
+
+                               renderScreenshots();
+
+                               // Update theme count.
+                               count = section.container.find( 'li.customize-control:visible' ).length;
+                               section.container.find( '.theme-count' ).text( count );
+                       });
+
+                       // Pre-load the first 3 theme screenshots.
+                       api.bind( 'ready', function () {
+                               _.each( section.controls().slice( 0, 3 ), function ( control ) {
+                                       var img, src = control.params.theme.screenshot[0];
+                                       if ( src ) {
+                                               img = new Image();
+                                               img.src = src;
+                                       }
+                               });
+                       });
+               },
+
+               /**
+                * Update UI to reflect expanded state
+                *
+                * @since 4.2.0
+                *
+                * @param {Boolean}  expanded
+                * @param {Object}   args
+                * @param {Boolean}  args.unchanged
+                * @param {Callback} args.completeCallback
+                */
+               onChangeExpanded: function ( expanded, args ) {
+
+                       // Immediately call the complete callback if there were no changes
+                       if ( args.unchanged ) {
+                               if ( args.completeCallback ) {
+                                       args.completeCallback();
+                               }
+                               return;
+                       }
+
+                       // Note: there is a second argument 'args' passed
+                       var panel = this,
+                               section = panel.contentContainer,
+                               overlay = section.closest( '.wp-full-overlay' ),
+                               container = section.closest( '.wp-full-overlay-sidebar-content' ),
+                               customizeBtn = section.find( '.customize-theme' ),
+                               changeBtn = panel.headContainer.find( '.change-theme' );
+
+                       if ( expanded && ! section.hasClass( 'current-panel' ) ) {
+                               // Collapse any sibling sections/panels
+                               api.section.each( function ( otherSection ) {
+                                       if ( otherSection !== panel ) {
+                                               otherSection.collapse( { duration: args.duration } );
+                                       }
+                               });
+                               api.panel.each( function ( otherPanel ) {
+                                       otherPanel.collapse( { duration: 0 } );
+                               });
+
+                               panel._animateChangeExpanded( function() {
+                                       changeBtn.attr( 'tabindex', '-1' );
+                                       customizeBtn.attr( 'tabindex', '0' );
+
+                                       customizeBtn.focus();
+                                       section.css( 'top', '' );
+                                       container.scrollTop( 0 );
+
+                                       if ( args.completeCallback ) {
+                                               args.completeCallback();
+                                       }
+                               } );
+
+                               overlay.addClass( 'in-themes-panel' );
+                               section.addClass( 'current-panel' );
+                               _.delay( panel.renderScreenshots, 10 ); // Wait for the controls
+                               panel.$customizeSidebar.on( 'scroll.customize-themes-section', _.throttle( panel.renderScreenshots, 300 ) );
+
+                       } else if ( ! expanded && section.hasClass( 'current-panel' ) ) {
+                               panel._animateChangeExpanded( function() {
+                                       changeBtn.attr( 'tabindex', '0' );
+                                       customizeBtn.attr( 'tabindex', '-1' );
+
+                                       changeBtn.focus();
+                                       section.css( 'top', '' );
+
+                                       if ( args.completeCallback ) {
+                                               args.completeCallback();
+                                       }
+                               } );
+
+                               overlay.removeClass( 'in-themes-panel' );
+                               section.removeClass( 'current-panel' );
+                               panel.$customizeSidebar.off( 'scroll.customize-themes-section' );
+                       }
+               },
+
+               /**
+                * Render control's screenshot if the control comes into view.
+                *
+                * @since 4.2.0
+                */
+               renderScreenshots: function( ) {
+                       var section = this;
+
+                       // Fill queue initially.
+                       if ( section.screenshotQueue === null ) {
+                               section.screenshotQueue = section.controls();
+                       }
+
+                       // Are all screenshots rendered?
+                       if ( ! section.screenshotQueue.length ) {
+                               return;
+                       }
+
+                       section.screenshotQueue = _.filter( section.screenshotQueue, function( control ) {
+                               var $imageWrapper = control.container.find( '.theme-screenshot' ),
+                                       $image = $imageWrapper.find( 'img' );
+
+                               if ( ! $image.length ) {
+                                       return false;
+                               }
+
+                               if ( $image.is( ':hidden' ) ) {
+                                       return true;
+                               }
+
+                               // Based on unveil.js.
+                               var wt = section.$window.scrollTop(),
+                                       wb = wt + section.$window.height(),
+                                       et = $image.offset().top,
+                                       ih = $imageWrapper.height(),
+                                       eb = et + ih,
+                                       threshold = ih * 3,
+                                       inView = eb >= wt - threshold && et <= wb + threshold;
+
+                               if ( inView ) {
+                                       control.container.trigger( 'render-screenshot' );
+                               }
+
+                               // If the image is in view return false so it's cleared from the queue.
+                               return ! inView;
+                       } );
+               },
+
+               /**
+                * Advance the modal to the next theme.
+                *
+                * @since 4.2.0
+                */
+               nextTheme: function () {
+                       var section = this;
+                       if ( section.getNextTheme() ) {
+                               section.showDetails( section.getNextTheme(), function() {
+                                       section.overlay.find( '.right' ).focus();
+                               } );
+                       }
+               },
+
+               /**
+                * Get the next theme model.
+                *
+                * @since 4.2.0
+                */
+               getNextTheme: function () {
+                       var control, next;
+                       control = api.control( 'theme_' + this.currentTheme );
+                       next = control.container.next( 'li.customize-control-theme' );
+                       if ( ! next.length ) {
+                               return false;
+                       }
+                       next = next[0].id.replace( 'customize-control-', '' );
+                       control = api.control( next );
+
+                       return control.params.theme;
+               },
+
+               /**
+                * Advance the modal to the previous theme.
+                *
+                * @since 4.2.0
+                */
+               previousTheme: function () {
+                       var section = this;
+                       if ( section.getPreviousTheme() ) {
+                               section.showDetails( section.getPreviousTheme(), function() {
+                                       section.overlay.find( '.left' ).focus();
+                               } );
+                       }
+               },
+
+               /**
+                * Get the previous theme model.
+                *
+                * @since 4.2.0
+                */
+               getPreviousTheme: function () {
+                       var control, previous;
+                       control = api.control( 'theme_' + this.currentTheme );
+                       previous = control.container.prev( 'li.customize-control-theme' );
+                       if ( ! previous.length ) {
+                               return false;
+                       }
+                       previous = previous[0].id.replace( 'customize-control-', '' );
+                       control = api.control( previous );
+
+                       return control.params.theme;
+               },
+
+               /**
+                * Disable buttons when we're viewing the first or last theme.
+                *
+                * @since 4.2.0
+                */
+               updateLimits: function () {
+                       if ( ! this.getNextTheme() ) {
+                               this.overlay.find( '.right' ).addClass( 'disabled' );
+                       }
+                       if ( ! this.getPreviousTheme() ) {
+                               this.overlay.find( '.left' ).addClass( 'disabled' );
+                       }
+               },
+
+               /**
+                * Load theme preview.
+                *
+                * @since 4.7.0
+                * @access public
+                *
+                * @param {string} themeId Theme ID.
+                * @returns {jQuery.promise} Promise.
+                */
+               loadThemePreview: function( themeId ) {
+                       var deferred = $.Deferred(), onceProcessingComplete, overlay, urlParser;
+
+                       urlParser = document.createElement( 'a' );
+                       urlParser.href = location.href;
+                       urlParser.search = $.param( _.extend(
+                               api.utils.parseQueryString( urlParser.search.substr( 1 ) ),
+                               {
+                                       theme: themeId,
+                                       changeset_uuid: api.settings.changeset.uuid
+                               }
+                       ) );
+
+                       overlay = $( '.wp-full-overlay' );
+                       overlay.addClass( 'customize-loading' );
+
+                       onceProcessingComplete = function() {
+                               var request;
+                               if ( api.state( 'processing' ).get() > 0 ) {
+                                       return;
+                               }
+
+                               api.state( 'processing' ).unbind( onceProcessingComplete );
+
+                               request = api.requestChangesetUpdate();
+                               request.done( function() {
+                                       $( window ).off( 'beforeunload.customize-confirm' );
+                                       top.location.href = urlParser.href;
+                                       deferred.resolve();
+                               } );
+                               request.fail( function() {
+                                       overlay.removeClass( 'customize-loading' );
+                                       deferred.reject();
+                               } );
+                       };
+
+                       if ( 0 === api.state( 'processing' ).get() ) {
+                               onceProcessingComplete();
+                       } else {
+                               api.state( 'processing' ).bind( onceProcessingComplete );
+                       }
+
+                       return deferred.promise();
+               },
+
+               /**
+                * Render & show the theme details for a given theme model.
+                *
+                * @since 4.2.0
+                *
+                * @param {Object}   theme
+                */
+               showDetails: function ( theme, callback ) {
+                       var section = this, link;
+                       callback = callback || function(){};
+                       section.currentTheme = theme.id;
+                       section.overlay.html( section.template( theme ) )
+                               .fadeIn( 'fast' )
+                               .focus();
+                       $( 'body' ).addClass( 'modal-open' );
+                       section.containFocus( section.overlay );
+                       section.updateLimits();
+
+                       link = section.overlay.find( '.inactive-theme > a' );
+
+                       link.on( 'click', function( event ) {
+                               event.preventDefault();
+
+                               // Short-circuit if request is currently being made.
+                               if ( link.hasClass( 'disabled' ) ) {
+                                       return;
+                               }
+                               link.addClass( 'disabled' );
+
+                               section.loadThemePreview( theme.id ).fail( function() {
+                                       link.removeClass( 'disabled' );
+                               } );
+                       } );
+                       callback();
+               },
+
+               /**
+                * Close the theme details modal.
+                *
+                * @since 4.2.0
+                */
+               closeDetails: function () {
+                       $( 'body' ).removeClass( 'modal-open' );
+                       this.overlay.fadeOut( 'fast' );
+                       api.control( 'theme_' + this.currentTheme ).focus();
+               },
+
+               /**
+                * Keep tab focus within the theme details modal.
+                *
+                * @since 4.2.0
+                */
+               containFocus: function( el ) {
+                       var tabbables;
+
+                       el.on( 'keydown', function( event ) {
+
+                               // Return if it's not the tab key
+                               // When navigating with prev/next focus is already handled
+                               if ( 9 !== event.keyCode ) {
+                                       return;
+                               }
+
+                               // uses jQuery UI to get the tabbable elements
+                               tabbables = $( ':tabbable', el );
+
+                               // Keep focus within the overlay
+                               if ( tabbables.last()[0] === event.target && ! event.shiftKey ) {
+                                       tabbables.first().focus();
+                                       return false;
+                               } else if ( tabbables.first()[0] === event.target && event.shiftKey ) {
+                                       tabbables.last().focus();
+                                       return false;
+                               }
+                       });
+               }
+       });
+
+       /**
+        * @since 4.1.0
+        *
+        * @class
+        * @augments wp.customize.Class
+        */
+       api.Panel = Container.extend({
+               containerType: 'panel',
+
+               /**
+                * @since 4.1.0
+                *
+                * @param {string}         id - The ID for the panel.
+                * @param {object}         options - Object containing one property: params.
+                * @param {object}         options.params - Object containing the following properties.
+                * @param {string}         options.params.title - Title shown when panel is collapsed and expanded.
+                * @param {string=}        [options.params.description] - Description shown at the top of the panel.
+                * @param {number=100}     [options.params.priority] - The sort priority for the panel.
+                * @param {string=default} [options.params.type] - The type of the panel. See wp.customize.panelConstructor.
+                * @param {string=}        [options.params.content] - The markup to be used for the panel container. If empty, a JS template is used.
+                * @param {boolean=true}   [options.params.active] - Whether the panel is active or not.
+                */
+               initialize: function ( id, options ) {
+                       var panel = this;
+                       Container.prototype.initialize.call( panel, id, options );
+                       panel.embed();
+                       panel.deferred.embedded.done( function () {
+                               panel.ready();
+                       });
+               },
+
+               /**
+                * Embed the container in the DOM when any parent panel is ready.
+                *
+                * @since 4.1.0
+                */
+               embed: function () {
+                       var panel = this,
+                               container = $( '#customize-theme-controls' ),
+                               parentContainer = $( '.customize-pane-parent' ); // @todo This should be defined elsewhere, and to be configurable
+
+                       if ( ! panel.headContainer.parent().is( parentContainer ) ) {
+                               parentContainer.append( panel.headContainer );
+                       }
+                       if ( ! panel.contentContainer.parent().is( panel.headContainer ) ) {
+                               container.append( panel.contentContainer );
+                               panel.renderContent();
+                       }
+
+                       panel.deferred.embedded.resolve();
+               },
+
+               /**
+                * @since 4.1.0
+                */
+               attachEvents: function () {
+                       var meta, panel = this;
+
+                       // Expand/Collapse accordion sections on click.
+                       panel.headContainer.find( '.accordion-section-title' ).on( 'click keydown', function( event ) {
+                               if ( api.utils.isKeydownButNotEnterEvent( event ) ) {
+                                       return;
+                               }
+                               event.preventDefault(); // Keep this AFTER the key filter above
+
+                               if ( ! panel.expanded() ) {
+                                       panel.expand();
+                               }
+                       });
+
+                       // Close panel.
+                       panel.container.find( '.customize-panel-back' ).on( 'click keydown', function( event ) {
+                               if ( api.utils.isKeydownButNotEnterEvent( event ) ) {
+                                       return;
+                               }
+                               event.preventDefault(); // Keep this AFTER the key filter above
+
+                               if ( panel.expanded() ) {
+                                       panel.collapse();
+                               }
+                       });
+
+                       meta = panel.container.find( '.panel-meta:first' );
+
+                       meta.find( '> .accordion-section-title .customize-help-toggle' ).on( 'click keydown', function( event ) {
+                               if ( api.utils.isKeydownButNotEnterEvent( event ) ) {
+                                       return;
+                               }
+                               event.preventDefault(); // Keep this AFTER the key filter above
+
+                               if ( meta.hasClass( 'cannot-expand' ) ) {
+                                       return;
+                               }
+
+                               var content = meta.find( '.customize-panel-description:first' );
+                               if ( meta.hasClass( 'open' ) ) {
+                                       meta.toggleClass( 'open' );
+                                       content.slideUp( panel.defaultExpandedArguments.duration );
+                                       $( this ).attr( 'aria-expanded', false );
+                               } else {
+                                       content.slideDown( panel.defaultExpandedArguments.duration );
+                                       meta.toggleClass( 'open' );
+                                       $( this ).attr( 'aria-expanded', true );
+                               }
+                       });
+
+               },
+
+               /**
+                * Get the sections that are associated with this panel, sorted by their priority Value.
+                *
+                * @since 4.1.0
+                *
+                * @returns {Array}
+                */
+               sections: function () {
+                       return this._children( 'panel', 'section' );
+               },
+
+               /**
+                * Return whether this panel has any active sections.
+                *
+                * @since 4.1.0
+                *
+                * @returns {boolean}
+                */
+               isContextuallyActive: function () {
+                       var panel = this,
+                               sections = panel.sections(),
+                               activeCount = 0;
+                       _( sections ).each( function ( section ) {
+                               if ( section.active() && section.isContextuallyActive() ) {
+                                       activeCount += 1;
+                               }
+                       } );
+                       return ( activeCount !== 0 );
+               },
+
+               /**
+                * Update UI to reflect expanded state
+                *
+                * @since 4.1.0
+                *
+                * @param {Boolean}  expanded
+                * @param {Object}   args
+                * @param {Boolean}  args.unchanged
+                * @param {Function} args.completeCallback
+                */
+               onChangeExpanded: function ( expanded, args ) {
+
+                       // Immediately call the complete callback if there were no changes
+                       if ( args.unchanged ) {
+                               if ( args.completeCallback ) {
+                                       args.completeCallback();
+                               }
+                               return;
+                       }
+
+                       // Note: there is a second argument 'args' passed
+                       var panel = this,
+                               accordionSection = panel.contentContainer,
+                               overlay = accordionSection.closest( '.wp-full-overlay' ),
+                               container = accordionSection.closest( '.wp-full-overlay-sidebar-content' ),
+                               topPanel = panel.headContainer.find( '.accordion-section-title' ),
+                               backBtn = accordionSection.find( '.customize-panel-back' );
+
+                       if ( expanded && ! accordionSection.hasClass( 'current-panel' ) ) {
+                               // Collapse any sibling sections/panels
+                               api.section.each( function ( section ) {
+                                       if ( panel.id !== section.panel() ) {
+                                               section.collapse( { duration: 0 } );
+                                       }
+                               });
+                               api.panel.each( function ( otherPanel ) {
+                                       if ( panel !== otherPanel ) {
+                                               otherPanel.collapse( { duration: 0 } );
+                                       }
+                               });
+
+                               panel._animateChangeExpanded( function() {
+                                       topPanel.attr( 'tabindex', '-1' );
+                                       backBtn.attr( 'tabindex', '0' );
+
+                                       backBtn.focus();
+                                       accordionSection.css( 'top', '' );
+                                       container.scrollTop( 0 );
+
+                                       if ( args.completeCallback ) {
+                                               args.completeCallback();
+                                       }
+                               } );
+
+                               overlay.addClass( 'in-sub-panel' );
+                               accordionSection.addClass( 'current-panel' );
+                               api.state( 'expandedPanel' ).set( panel );
+
+                       } else if ( ! expanded && accordionSection.hasClass( 'current-panel' ) ) {
+                               panel._animateChangeExpanded( function() {
+                                       topPanel.attr( 'tabindex', '0' );
+                                       backBtn.attr( 'tabindex', '-1' );
+
+                                       topPanel.focus();
+                                       accordionSection.css( 'top', '' );
+
+                                       if ( args.completeCallback ) {
+                                               args.completeCallback();
+                                       }
+                               } );
+
+                               overlay.removeClass( 'in-sub-panel' );
+                               accordionSection.removeClass( 'current-panel' );
+                               if ( panel === api.state( 'expandedPanel' ).get() ) {
+                                       api.state( 'expandedPanel' ).set( false );
+                               }
+                       }
+               },
+
+               /**
+                * Render the panel from its JS template, if it exists.
+                *
+                * The panel's container must already exist in the DOM.
+                *
+                * @since 4.3.0
+                */
+               renderContent: function () {
+                       var template,
+                               panel = this;
+
+                       // Add the content to the container.
+                       if ( 0 !== $( '#tmpl-' + panel.templateSelector + '-content' ).length ) {
+                               template = wp.template( panel.templateSelector + '-content' );
+                       } else {
+                               template = wp.template( 'customize-panel-default-content' );
+                       }
+                       if ( template && panel.headContainer ) {
+                               panel.contentContainer.html( template( panel.params ) );
+                       }
+               }
+       });
+
+       /**
+        * A Customizer Control.
+        *
+        * A control provides a UI element that allows a user to modify a Customizer Setting.
+        *
+        * @see PHP class WP_Customize_Control.
+        *
+        * @class
+        * @augments wp.customize.Class
+        *
+        * @param {string} id                              Unique identifier for the control instance.
+        * @param {object} options                         Options hash for the control instance.
+        * @param {object} options.params
+        * @param {object} options.params.type             Type of control (e.g. text, radio, dropdown-pages, etc.)
+        * @param {string} options.params.content          The HTML content for the control.
+        * @param {string} options.params.priority         Order of priority to show the control within the section.
+        * @param {string} options.params.active
+        * @param {string} options.params.section          The ID of the section the control belongs to.
+        * @param {string} options.params.settings.default The ID of the setting the control relates to.
+        * @param {string} options.params.settings.data
+        * @param {string} options.params.label
+        * @param {string} options.params.description
+        * @param {string} options.params.instanceNumber Order in which this instance was created in relation to other instances.
+        */
+       api.Control = api.Class.extend({
+               defaultActiveArguments: { duration: 'fast', completeCallback: $.noop },
+
+               initialize: function( id, options ) {
+                       var control = this,
+                               nodes, radios, settings;
+
+                       control.params = {};
+                       $.extend( control, options || {} );
+                       control.id = id;
+                       control.selector = '#customize-control-' + id.replace( /\]/g, '' ).replace( /\[/g, '-' );
+                       control.templateSelector = 'customize-control-' + control.params.type + '-content';
+                       control.container = control.params.content ? $( control.params.content ) : $( control.selector );
+
+                       control.deferred = {
+                               embedded: new $.Deferred()
+                       };
+                       control.section = new api.Value();
+                       control.priority = new api.Value();
+                       control.active = new api.Value();
+                       control.activeArgumentsQueue = [];
+                       control.notifications = new api.Values({ defaultConstructor: api.Notification });
+
+                       control.elements = [];
+
+                       nodes  = control.container.find('[data-customize-setting-link]');
+                       radios = {};
+
+                       nodes.each( function() {
+                               var node = $( this ),
+                                       name;
+
+                               if ( node.is( ':radio' ) ) {
+                                       name = node.prop( 'name' );
+                                       if ( radios[ name ] ) {
+                                               return;
+                                       }
+
+                                       radios[ name ] = true;
+                                       node = nodes.filter( '[name="' + name + '"]' );
+                               }
+
+                               api( node.data( 'customizeSettingLink' ), function( setting ) {
+                                       var element = new api.Element( node );
+                                       control.elements.push( element );
+                                       element.sync( setting );
+                                       element.set( setting() );
+                               });
+                       });
+
+                       control.active.bind( function ( active ) {
+                               var args = control.activeArgumentsQueue.shift();
+                               args = $.extend( {}, control.defaultActiveArguments, args );
+                               control.onChangeActive( active, args );
+                       } );
+
+                       control.section.set( control.params.section );
+                       control.priority.set( isNaN( control.params.priority ) ? 10 : control.params.priority );
+                       control.active.set( control.params.active );
+
+                       api.utils.bubbleChildValueChanges( control, [ 'section', 'priority', 'active' ] );
+
+                       /*
+                        * After all settings related to the control are available,
+                        * make them available on the control and embed the control into the page.
+                        */
+                       settings = $.map( control.params.settings, function( value ) {
+                               return value;
+                       });
+
+                       if ( 0 === settings.length ) {
+                               control.setting = null;
+                               control.settings = {};
+                               control.embed();
+                       } else {
+                               api.apply( api, settings.concat( function() {
+                                       var key;
+
+                                       control.settings = {};
+                                       for ( key in control.params.settings ) {
+                                               control.settings[ key ] = api( control.params.settings[ key ] );
+                                       }
+
+                                       control.setting = control.settings['default'] || null;
+
+                                       // Add setting notifications to the control notification.
+                                       _.each( control.settings, function( setting ) {
+                                               setting.notifications.bind( 'add', function( settingNotification ) {
+                                                       var controlNotification, code, params;
+                                                       code = setting.id + ':' + settingNotification.code;
+                                                       params = _.extend(
+                                                               {},
+                                                               settingNotification,
+                                                               {
+                                                                       setting: setting.id
+                                                               }
+                                                       );
+                                                       controlNotification = new api.Notification( code, params );
+                                                       control.notifications.add( controlNotification.code, controlNotification );
+                                               } );
+                                               setting.notifications.bind( 'remove', function( settingNotification ) {
+                                                       control.notifications.remove( setting.id + ':' + settingNotification.code );
+                                               } );
+                                       } );
+
+                                       control.embed();
+                               }) );
+                       }
+
+                       // After the control is embedded on the page, invoke the "ready" method.
+                       control.deferred.embedded.done( function () {
+                               /*
+                                * Note that this debounced/deferred rendering is needed for two reasons:
+                                * 1) The 'remove' event is triggered just _before_ the notification is actually removed.
+                                * 2) Improve performance when adding/removing multiple notifications at a time.
+                                */
+                               var debouncedRenderNotifications = _.debounce( function renderNotifications() {
+                                       control.renderNotifications();
+                               } );
+                               control.notifications.bind( 'add', function( notification ) {
+                                       wp.a11y.speak( notification.message, 'assertive' );
+                                       debouncedRenderNotifications();
+                               } );
+                               control.notifications.bind( 'remove', debouncedRenderNotifications );
+                               control.renderNotifications();
+
+                               control.ready();
+                       });
+               },
+
+               /**
+                * Embed the control into the page.
+                */
+               embed: function () {
+                       var control = this,
+                               inject;
+
+                       // Watch for changes to the section state
+                       inject = function ( sectionId ) {
+                               var parentContainer;
+                               if ( ! sectionId ) { // @todo allow a control to be embedded without a section, for instance a control embedded in the front end.
+                                       return;
+                               }
+                               // Wait for the section to be registered
+                               api.section( sectionId, function ( section ) {
+                                       // Wait for the section to be ready/initialized
+                                       section.deferred.embedded.done( function () {
+                                               parentContainer = ( section.contentContainer.is( 'ul' ) ) ? section.contentContainer : section.contentContainer.find( 'ul:first' );
+                                               if ( ! control.container.parent().is( parentContainer ) ) {
+                                                       parentContainer.append( control.container );
+                                                       control.renderContent();
+                                               }
+                                               control.deferred.embedded.resolve();
+                                       });
+                               });
+                       };
+                       control.section.bind( inject );
+                       inject( control.section.get() );
+               },
+
+               /**
+                * Triggered when the control's markup has been injected into the DOM.
+                *
+                * @returns {void}
+                */
+               ready: function() {
+                       var control = this, newItem;
+                       if ( 'dropdown-pages' === control.params.type && control.params.allow_addition ) {
+                               newItem = control.container.find( '.new-content-item' );
+                               newItem.hide(); // Hide in JS to preserve flex display when showing.
+                               control.container.on( 'click', '.add-new-toggle', function( e ) {
+                                       $( e.currentTarget ).slideUp( 180 );
+                                       newItem.slideDown( 180 );
+                                       newItem.find( '.create-item-input' ).focus();
+                               });
+                               control.container.on( 'click', '.add-content', function() {
+                                       control.addNewPage();
+                               });
+                               control.container.on( 'keyup', '.create-item-input', function( e ) {
+                                       if ( 13 === e.which ) { // Enter
+                                               control.addNewPage();
+                                       }
+                               });
+                       }
+               },
+
+               /**
+                * Get the element inside of a control's container that contains the validation error message.
+                *
+                * Control subclasses may override this to return the proper container to render notifications into.
+                * Injects the notification container for existing controls that lack the necessary container,
+                * including special handling for nav menu items and widgets.
+                *
+                * @since 4.6.0
+                * @returns {jQuery} Setting validation message element.
+                * @this {wp.customize.Control}
+                */
+               getNotificationsContainerElement: function() {
+                       var control = this, controlTitle, notificationsContainer;
+
+                       notificationsContainer = control.container.find( '.customize-control-notifications-container:first' );
+                       if ( notificationsContainer.length ) {
+                               return notificationsContainer;
+                       }
+
+                       notificationsContainer = $( '<div class="customize-control-notifications-container"></div>' );
+
+                       if ( control.container.hasClass( 'customize-control-nav_menu_item' ) ) {
+                               control.container.find( '.menu-item-settings:first' ).prepend( notificationsContainer );
+                       } else if ( control.container.hasClass( 'customize-control-widget_form' ) ) {
+                               control.container.find( '.widget-inside:first' ).prepend( notificationsContainer );
+                       } else {
+                               controlTitle = control.container.find( '.customize-control-title' );
+                               if ( controlTitle.length ) {
+                                       controlTitle.after( notificationsContainer );
+                               } else {
+                                       control.container.prepend( notificationsContainer );
+                               }
+                       }
+                       return notificationsContainer;
+               },
+
+               /**
+                * Render notifications.
+                *
+                * Renders the `control.notifications` into the control's container.
+                * Control subclasses may override this method to do their own handling
+                * of rendering notifications.
+                *
+                * @since 4.6.0
+                * @this {wp.customize.Control}
+                */
+               renderNotifications: function() {
+                       var control = this, container, notifications, hasError = false;
+                       container = control.getNotificationsContainerElement();
+                       if ( ! container || ! container.length ) {
+                               return;
+                       }
+                       notifications = [];
+                       control.notifications.each( function( notification ) {
+                               notifications.push( notification );
+                               if ( 'error' === notification.type ) {
+                                       hasError = true;
+                               }
+                       } );
+
+                       if ( 0 === notifications.length ) {
+                               container.stop().slideUp( 'fast' );
+                       } else {
+                               container.stop().slideDown( 'fast', null, function() {
+                                       $( this ).css( 'height', 'auto' );
+                               } );
+                       }
+
+                       if ( ! control.notificationsTemplate ) {
+                               control.notificationsTemplate = wp.template( 'customize-control-notifications' );
+                       }
+
+                       control.container.toggleClass( 'has-notifications', 0 !== notifications.length );
+                       control.container.toggleClass( 'has-error', hasError );
+                       container.empty().append( $.trim(
+                               control.notificationsTemplate( { notifications: notifications, altNotice: Boolean( control.altNotice ) } )
+                       ) );
+               },
+
+               /**
+                * Normal controls do not expand, so just expand its parent
+                *
+                * @param {Object} [params]
+                */
+               expand: function ( params ) {
+                       api.section( this.section() ).expand( params );
+               },
+
+               /**
+                * Bring the containing section and panel into view and then
+                * this control into view, focusing on the first input.
+                */
+               focus: focus,
+
+               /**
+                * Update UI in response to a change in the control's active state.
+                * This does not change the active state, it merely handles the behavior
+                * for when it does change.
+                *
+                * @since 4.1.0
+                *
+                * @param {Boolean}  active
+                * @param {Object}   args
+                * @param {Number}   args.duration
+                * @param {Callback} args.completeCallback
+                */
+               onChangeActive: function ( active, args ) {
+                       if ( args.unchanged ) {
+                               if ( args.completeCallback ) {
+                                       args.completeCallback();
+                               }
+                               return;
+                       }
+
+                       if ( ! $.contains( document, this.container[0] ) ) {
+                               // jQuery.fn.slideUp is not hiding an element if it is not in the DOM
+                               this.container.toggle( active );
+                               if ( args.completeCallback ) {
+                                       args.completeCallback();
+                               }
+                       } else if ( active ) {
+                               this.container.slideDown( args.duration, args.completeCallback );
+                       } else {
+                               this.container.slideUp( args.duration, args.completeCallback );
+                       }
+               },
+
+               /**
+                * @deprecated 4.1.0 Use this.onChangeActive() instead.
+                */
+               toggle: function ( active ) {
+                       return this.onChangeActive( active, this.defaultActiveArguments );
+               },
+
+               /**
+                * Shorthand way to enable the active state.
+                *
+                * @since 4.1.0
+                *
+                * @param {Object} [params]
+                * @returns {Boolean} false if already active
+                */
+               activate: Container.prototype.activate,
+
+               /**
+                * Shorthand way to disable the active state.
+                *
+                * @since 4.1.0
+                *
+                * @param {Object} [params]
+                * @returns {Boolean} false if already inactive
+                */
+               deactivate: Container.prototype.deactivate,
+
+               /**
+                * Re-use _toggleActive from Container class.
+                *
+                * @access private
+                */
+               _toggleActive: Container.prototype._toggleActive,
+
+               dropdownInit: function() {
+                       var control      = this,
+                               statuses     = this.container.find('.dropdown-status'),
+                               params       = this.params,
+                               toggleFreeze = false,
+                               update       = function( to ) {
+                                       if ( typeof to === 'string' && params.statuses && params.statuses[ to ] )
+                                               statuses.html( params.statuses[ to ] ).show();
+                                       else
+                                               statuses.hide();
+                               };
+
+                       // Support the .dropdown class to open/close complex elements
+                       this.container.on( 'click keydown', '.dropdown', function( event ) {
+                               if ( api.utils.isKeydownButNotEnterEvent( event ) ) {
+                                       return;
+                               }
+
+                               event.preventDefault();
+
+                               if (!toggleFreeze)
+                                       control.container.toggleClass('open');
+
+                               if ( control.container.hasClass('open') )
+                                       control.container.parent().parent().find('li.library-selected').focus();
+
+                               // Don't want to fire focus and click at same time
+                               toggleFreeze = true;
+                               setTimeout(function () {
+                                       toggleFreeze = false;
+                               }, 400);
+                       });
+
+                       this.setting.bind( update );
+                       update( this.setting() );
+               },
+
+               /**
+                * Render the control from its JS template, if it exists.
+                *
+                * The control's container must already exist in the DOM.
+                *
+                * @since 4.1.0
+                */
+               renderContent: function () {
+                       var template,
+                               control = this;
+
+                       // Replace the container element's content with the control.
+                       if ( 0 !== $( '#tmpl-' + control.templateSelector ).length ) {
+                               template = wp.template( control.templateSelector );
+                               if ( template && control.container ) {
+                                       control.container.html( template( control.params ) );
+                               }
+                       }
+               },
+
+               /**
+                * Add a new page to a dropdown-pages control reusing menus code for this.
+                *
+                * @since 4.7.0
+                * @access private
+                * @returns {void}
+                */
+               addNewPage: function () {
+                       var control = this, promise, toggle, container, input, title, select;
+
+                       if ( 'dropdown-pages' !== control.params.type || ! control.params.allow_addition || ! api.Menus ) {
+                               return;
+                       }
+
+                       toggle = control.container.find( '.add-new-toggle' );
+                       container = control.container.find( '.new-content-item' );
+                       input = control.container.find( '.create-item-input' );
+                       title = input.val();
+                       select = control.container.find( 'select' );
+
+                       if ( ! title ) {
+                               input.addClass( 'invalid' );
+                               return;
+                       }
+
+                       input.removeClass( 'invalid' );
+                       input.attr( 'disabled', 'disabled' );
+
+                       // The menus functions add the page, publish when appropriate, and also add the new page to the dropdown-pages controls.
+                       promise = api.Menus.insertAutoDraftPost( {
+                               post_title: title,
+                               post_type: 'page'
+                       } );
+                       promise.done( function( data ) {
+                               var availableItem, $content, itemTemplate;
+
+                               // Prepare the new page as an available menu item.
+                               // See api.Menus.submitNew().
+                               availableItem = new api.Menus.AvailableItemModel( {
+                                       'id': 'post-' + data.post_id, // Used for available menu item Backbone models.
+                                       'title': title,
+                                       'type': 'page',
+                                       'type_label': api.Menus.data.l10n.page_label,
+                                       'object': 'post_type',
+                                       'object_id': data.post_id,
+                                       'url': data.url
+                               } );
+
+                               // Add the new item to the list of available menu items.
+                               api.Menus.availableMenuItemsPanel.collection.add( availableItem );
+                               $content = $( '#available-menu-items-post_type-page' ).find( '.available-menu-items-list' );
+                               itemTemplate = wp.template( 'available-menu-item' );
+                               $content.prepend( itemTemplate( availableItem.attributes ) );
+
+                               // Focus the select control.
+                               select.focus();
+                               control.setting.set( String( data.post_id ) ); // Triggers a preview refresh and updates the setting.
+
+                               // Reset the create page form.
+                               container.slideUp( 180 );
+                               toggle.slideDown( 180 );
+                       } );
+                       promise.always( function() {
+                               input.val( '' ).removeAttr( 'disabled' );
+                       } );
+               }
+       });
+
+       /**
+        * A colorpicker control.
+        *
+        * @class
+        * @augments wp.customize.Control
+        * @augments wp.customize.Class
+        */
+       api.ColorControl = api.Control.extend({
+               ready: function() {
+                       var control = this,
+                               isHueSlider = this.params.mode === 'hue',
+                               updating = false,
+                               picker;
+
+                       if ( isHueSlider ) {
+                               picker = this.container.find( '.color-picker-hue' );
+                               picker.val( control.setting() ).wpColorPicker({
+                                       change: function( event, ui ) {
+                                               updating = true;
+                                               control.setting( ui.color.h() );
+                                               updating = false;
+                                       }
+                               });
+                       } else {
+                               picker = this.container.find( '.color-picker-hex' );
+                               picker.val( control.setting() ).wpColorPicker({
+                                       change: function() {
+                                               updating = true;
+                                               control.setting.set( picker.wpColorPicker( 'color' ) );
+                                               updating = false;
+                                       },
+                                       clear: function() {
+                                               updating = true;
+                                               control.setting.set( '' );
+                                               updating = false;
+                                       }
+                               });
+                       }
+
+                       control.setting.bind( function ( value ) {
+                               // Bail if the update came from the control itself.
+                               if ( updating ) {
+                                       return;
+                               }
+                               picker.val( value );
+                               picker.wpColorPicker( 'color', value );
+                       } );
+
+                       // Collapse color picker when hitting Esc instead of collapsing the current section.
+                       control.container.on( 'keydown', function( event ) {
+                               var pickerContainer;
+                               if ( 27 !== event.which ) { // Esc.
+                                       return;
+                               }
+                               pickerContainer = control.container.find( '.wp-picker-container' );
+                               if ( pickerContainer.hasClass( 'wp-picker-active' ) ) {
+                                       picker.wpColorPicker( 'close' );
+                                       control.container.find( '.wp-color-result' ).focus();
+                                       event.stopPropagation(); // Prevent section from being collapsed.
+                               }
+                       } );
+               }
+       });
+
+       /**
+        * A control that implements the media modal.
+        *
+        * @class
+        * @augments wp.customize.Control
+        * @augments wp.customize.Class
+        */
+       api.MediaControl = api.Control.extend({
+
+               /**
+                * When the control's DOM structure is ready,
+                * set up internal event bindings.
+                */
+               ready: function() {
+                       var control = this;
+                       // Shortcut so that we don't have to use _.bind every time we add a callback.
+                       _.bindAll( control, 'restoreDefault', 'removeFile', 'openFrame', 'select', 'pausePlayer' );
+
+                       // Bind events, with delegation to facilitate re-rendering.
+                       control.container.on( 'click keydown', '.upload-button', control.openFrame );
+                       control.container.on( 'click keydown', '.upload-button', control.pausePlayer );
+                       control.container.on( 'click keydown', '.thumbnail-image img', control.openFrame );
+                       control.container.on( 'click keydown', '.default-button', control.restoreDefault );
+                       control.container.on( 'click keydown', '.remove-button', control.pausePlayer );
+                       control.container.on( 'click keydown', '.remove-button', control.removeFile );
+                       control.container.on( 'click keydown', '.remove-button', control.cleanupPlayer );
+
+                       // Resize the player controls when it becomes visible (ie when section is expanded)
+                       api.section( control.section() ).container
+                               .on( 'expanded', function() {
+                                       if ( control.player ) {
+                                               control.player.setControlsSize();
+                                       }
+                               })
+                               .on( 'collapsed', function() {
+                                       control.pausePlayer();
+                               });
+
+                       /**
+                        * Set attachment data and render content.
+                        *
+                        * Note that BackgroundImage.prototype.ready applies this ready method
+                        * to itself. Since BackgroundImage is an UploadControl, the value
+                        * is the attachment URL instead of the attachment ID. In this case
+                        * we skip fetching the attachment data because we have no ID available,
+                        * and it is the responsibility of the UploadControl to set the control's
+                        * attachmentData before calling the renderContent method.
+                        *
+                        * @param {number|string} value Attachment
+                        */
+                       function setAttachmentDataAndRenderContent( value ) {
+                               var hasAttachmentData = $.Deferred();
+
+                               if ( control.extended( api.UploadControl ) ) {
+                                       hasAttachmentData.resolve();
+                               } else {
+                                       value = parseInt( value, 10 );
+                                       if ( _.isNaN( value ) || value <= 0 ) {
+                                               delete control.params.attachment;
+                                               hasAttachmentData.resolve();
+                                       } else if ( control.params.attachment && control.params.attachment.id === value ) {
+                                               hasAttachmentData.resolve();
+                                       }
+                               }
+
+                               // Fetch the attachment data.
+                               if ( 'pending' === hasAttachmentData.state() ) {
+                                       wp.media.attachment( value ).fetch().done( function() {
+                                               control.params.attachment = this.attributes;
+                                               hasAttachmentData.resolve();
+
+                                               // Send attachment information to the preview for possible use in `postMessage` transport.
+                                               wp.customize.previewer.send( control.setting.id + '-attachment-data', this.attributes );
+                                       } );
+                               }
+
+                               hasAttachmentData.done( function() {
+                                       control.renderContent();
+                               } );
+                       }
+
+                       // Ensure attachment data is initially set (for dynamically-instantiated controls).
+                       setAttachmentDataAndRenderContent( control.setting() );
+
+                       // Update the attachment data and re-render the control when the setting changes.
+                       control.setting.bind( setAttachmentDataAndRenderContent );
+               },
+
+               pausePlayer: function () {
+                       this.player && this.player.pause();
+               },
+
+               cleanupPlayer: function () {
+                       this.player && wp.media.mixin.removePlayer( this.player );
+               },
+
+               /**
+                * Open the media modal.
+                */
+               openFrame: function( event ) {
+                       if ( api.utils.isKeydownButNotEnterEvent( event ) ) {
+                               return;
+                       }
+
+                       event.preventDefault();
+
+                       if ( ! this.frame ) {
+                               this.initFrame();
+                       }
+
+                       this.frame.open();
+               },
+
+               /**
+                * Create a media modal select frame, and store it so the instance can be reused when needed.
+                */
+               initFrame: function() {
+                       this.frame = wp.media({
+                               button: {
+                                       text: this.params.button_labels.frame_button
+                               },
+                               states: [
+                                       new wp.media.controller.Library({
+                                               title:     this.params.button_labels.frame_title,
+                                               library:   wp.media.query({ type: this.params.mime_type }),
+                                               multiple:  false,
+                                               date:      false
+                                       })
+                               ]
+                       });
+
+                       // When a file is selected, run a callback.
+                       this.frame.on( 'select', this.select );
+               },
+
+               /**
+                * Callback handler for when an attachment is selected in the media modal.
+                * Gets the selected image information, and sets it within the control.
+                */
+               select: function() {
+                       // Get the attachment from the modal frame.
+                       var node,
+                               attachment = this.frame.state().get( 'selection' ).first().toJSON(),
+                               mejsSettings = window._wpmejsSettings || {};
+
+                       this.params.attachment = attachment;
+
+                       // Set the Customizer setting; the callback takes care of rendering.
+                       this.setting( attachment.id );
+                       node = this.container.find( 'audio, video' ).get(0);
+
+                       // Initialize audio/video previews.
+                       if ( node ) {
+                               this.player = new MediaElementPlayer( node, mejsSettings );
+                       } else {
+                               this.cleanupPlayer();
+                       }
+               },
+
+               /**
+                * Reset the setting to the default value.
+                */
+               restoreDefault: function( event ) {
+                       if ( api.utils.isKeydownButNotEnterEvent( event ) ) {
+                               return;
                        }
+                       event.preventDefault();
+
+                       this.params.attachment = this.params.defaultAttachment;
+                       this.setting( this.params.defaultAttachment.url );
+               },
+
+               /**
+                * Called when the "Remove" link is clicked. Empties the setting.
+                *
+                * @param {object} event jQuery Event object
+                */
+               removeFile: function( event ) {
+                       if ( api.utils.isKeydownButNotEnterEvent( event ) ) {
+                               return;
+                       }
+                       event.preventDefault();
+
+                       this.params.attachment = {};
+                       this.setting( '' );
+                       this.renderContent(); // Not bound to setting change when emptying.
                }
        });
 
-       api.Control = api.Class.extend({
-               initialize: function( id, options ) {
-                       var control = this,
-                               nodes, radios, settings;
+       /**
+        * An upload control, which utilizes the media modal.
+        *
+        * @class
+        * @augments wp.customize.MediaControl
+        * @augments wp.customize.Control
+        * @augments wp.customize.Class
+        */
+       api.UploadControl = api.MediaControl.extend({
 
-                       this.params = {};
-                       $.extend( this, options || {} );
+               /**
+                * Callback handler for when an attachment is selected in the media modal.
+                * Gets the selected image information, and sets it within the control.
+                */
+               select: function() {
+                       // Get the attachment from the modal frame.
+                       var node,
+                               attachment = this.frame.state().get( 'selection' ).first().toJSON(),
+                               mejsSettings = window._wpmejsSettings || {};
+
+                       this.params.attachment = attachment;
+
+                       // Set the Customizer setting; the callback takes care of rendering.
+                       this.setting( attachment.url );
+                       node = this.container.find( 'audio, video' ).get(0);
+
+                       // Initialize audio/video previews.
+                       if ( node ) {
+                               this.player = new MediaElementPlayer( node, mejsSettings );
+                       } else {
+                               this.cleanupPlayer();
+                       }
+               },
 
-                       this.id = id;
-                       this.selector = '#customize-control-' + id.replace( /\]/g, '' ).replace( /\[/g, '-' );
-                       this.container = $( this.selector );
+               // @deprecated
+               success: function() {},
 
-                       settings = $.map( this.params.settings, function( value ) {
-                               return value;
-                       });
+               // @deprecated
+               removerVisibility: function() {}
+       });
 
-                       api.apply( api, settings.concat( function() {
-                               var key;
+       /**
+        * A control for uploading images.
+        *
+        * This control no longer needs to do anything more
+        * than what the upload control does in JS.
+        *
+        * @class
+        * @augments wp.customize.UploadControl
+        * @augments wp.customize.MediaControl
+        * @augments wp.customize.Control
+        * @augments wp.customize.Class
+        */
+       api.ImageControl = api.UploadControl.extend({
+               // @deprecated
+               thumbnailSrc: function() {}
+       });
 
-                               control.settings = {};
-                               for ( key in control.params.settings ) {
-                                       control.settings[ key ] = api( control.params.settings[ key ] );
-                               }
+       /**
+        * A control for uploading background images.
+        *
+        * @class
+        * @augments wp.customize.UploadControl
+        * @augments wp.customize.MediaControl
+        * @augments wp.customize.Control
+        * @augments wp.customize.Class
+        */
+       api.BackgroundControl = api.UploadControl.extend({
 
-                               control.setting = control.settings['default'] || null;
-                               control.ready();
-                       }) );
+               /**
+                * When the control's DOM structure is ready,
+                * set up internal event bindings.
+                */
+               ready: function() {
+                       api.UploadControl.prototype.ready.apply( this, arguments );
+               },
 
-                       control.elements = [];
+               /**
+                * Callback handler for when an attachment is selected in the media modal.
+                * Does an additional AJAX request for setting the background context.
+                */
+               select: function() {
+                       api.UploadControl.prototype.select.apply( this, arguments );
+
+                       wp.ajax.post( 'custom-background-add', {
+                               nonce: _wpCustomizeBackground.nonces.add,
+                               wp_customize: 'on',
+                               customize_theme: api.settings.theme.stylesheet,
+                               attachment_id: this.params.attachment.id
+                       } );
+               }
+       });
 
-                       nodes  = this.container.find('[data-customize-setting-link]');
-                       radios = {};
+       /**
+        * A control for positioning a background image.
+        *
+        * @since 4.7.0
+        *
+        * @class
+        * @augments wp.customize.Control
+        * @augments wp.customize.Class
+        */
+       api.BackgroundPositionControl = api.Control.extend( {
 
-                       nodes.each( function() {
-                               var node = $(this),
-                                       name;
+               /**
+                * Set up control UI once embedded in DOM and settings are created.
+                *
+                * @since 4.7.0
+                * @access public
+                */
+               ready: function() {
+                       var control = this, updateRadios;
 
-                               if ( node.is(':radio') ) {
-                                       name = node.prop('name');
-                                       if ( radios[ name ] )
-                                               return;
+                       control.container.on( 'change', 'input[name="background-position"]', function() {
+                               var position = $( this ).val().split( ' ' );
+                               control.settings.x( position[0] );
+                               control.settings.y( position[1] );
+                       } );
 
-                                       radios[ name ] = true;
-                                       node = nodes.filter( '[name="' + name + '"]' );
-                               }
+                       updateRadios = _.debounce( function() {
+                               var x, y, radioInput, inputValue;
+                               x = control.settings.x.get();
+                               y = control.settings.y.get();
+                               inputValue = String( x ) + ' ' + String( y );
+                               radioInput = control.container.find( 'input[name="background-position"][value="' + inputValue + '"]' );
+                               radioInput.click();
+                       } );
+                       control.settings.x.bind( updateRadios );
+                       control.settings.y.bind( updateRadios );
 
-                               api( node.data('customizeSettingLink'), function( setting ) {
-                                       var element = new api.Element( node );
-                                       control.elements.push( element );
-                                       element.sync( setting );
-                                       element.set( setting() );
-                               });
+                       updateRadios(); // Set initial UI.
+               }
+       } );
+
+       /**
+        * A control for selecting and cropping an image.
+        *
+        * @class
+        * @augments wp.customize.MediaControl
+        * @augments wp.customize.Control
+        * @augments wp.customize.Class
+        */
+       api.CroppedImageControl = api.MediaControl.extend({
+
+               /**
+                * Open the media modal to the library state.
+                */
+               openFrame: function( event ) {
+                       if ( api.utils.isKeydownButNotEnterEvent( event ) ) {
+                               return;
+                       }
+
+                       this.initFrame();
+                       this.frame.setState( 'library' ).open();
+               },
+
+               /**
+                * Create a media modal select frame, and store it so the instance can be reused when needed.
+                */
+               initFrame: function() {
+                       var l10n = _wpMediaViewsL10n;
+
+                       this.frame = wp.media({
+                               button: {
+                                       text: l10n.select,
+                                       close: false
+                               },
+                               states: [
+                                       new wp.media.controller.Library({
+                                               title: this.params.button_labels.frame_title,
+                                               library: wp.media.query({ type: 'image' }),
+                                               multiple: false,
+                                               date: false,
+                                               priority: 20,
+                                               suggestedWidth: this.params.width,
+                                               suggestedHeight: this.params.height
+                                       }),
+                                       new wp.media.controller.CustomizeImageCropper({
+                                               imgSelectOptions: this.calculateImageSelectOptions,
+                                               control: this
+                                       })
+                               ]
                        });
+
+                       this.frame.on( 'select', this.onSelect, this );
+                       this.frame.on( 'cropped', this.onCropped, this );
+                       this.frame.on( 'skippedcrop', this.onSkippedCrop, this );
                },
 
-               ready: function() {},
+               /**
+                * After an image is selected in the media modal, switch to the cropper
+                * state if the image isn't the right size.
+                */
+               onSelect: function() {
+                       var attachment = this.frame.state().get( 'selection' ).first().toJSON();
+
+                       if ( this.params.width === attachment.width && this.params.height === attachment.height && ! this.params.flex_width && ! this.params.flex_height ) {
+                               this.setImageFromAttachment( attachment );
+                               this.frame.close();
+                       } else {
+                               this.frame.setState( 'cropper' );
+                       }
+               },
 
-               dropdownInit: function() {
-                       var control      = this,
-                               statuses     = this.container.find('.dropdown-status'),
-                               params       = this.params,
-                               toggleFreeze = false,
-                               update       = function( to ) {
-                                       if ( typeof to === 'string' && params.statuses && params.statuses[ to ] )
-                                               statuses.html( params.statuses[ to ] ).show();
-                                       else
-                                               statuses.hide();
-                               };
+               /**
+                * After the image has been cropped, apply the cropped image data to the setting.
+                *
+                * @param {object} croppedImage Cropped attachment data.
+                */
+               onCropped: function( croppedImage ) {
+                       this.setImageFromAttachment( croppedImage );
+               },
 
-                       // Support the .dropdown class to open/close complex elements
-                       this.container.on( 'click keydown', '.dropdown', function( event ) {
-                               if ( event.type === 'keydown' &&  13 !== event.which ) // enter
-                                       return;
+               /**
+                * Returns a set of options, computed from the attached image data and
+                * control-specific data, to be fed to the imgAreaSelect plugin in
+                * wp.media.view.Cropper.
+                *
+                * @param {wp.media.model.Attachment} attachment
+                * @param {wp.media.controller.Cropper} controller
+                * @returns {Object} Options
+                */
+               calculateImageSelectOptions: function( attachment, controller ) {
+                       var control    = controller.get( 'control' ),
+                               flexWidth  = !! parseInt( control.params.flex_width, 10 ),
+                               flexHeight = !! parseInt( control.params.flex_height, 10 ),
+                               realWidth  = attachment.get( 'width' ),
+                               realHeight = attachment.get( 'height' ),
+                               xInit = parseInt( control.params.width, 10 ),
+                               yInit = parseInt( control.params.height, 10 ),
+                               ratio = xInit / yInit,
+                               xImg  = xInit,
+                               yImg  = yInit,
+                               x1, y1, imgSelectOptions;
+
+                       controller.set( 'canSkipCrop', ! control.mustBeCropped( flexWidth, flexHeight, xInit, yInit, realWidth, realHeight ) );
+
+                       if ( realWidth / realHeight > ratio ) {
+                               yInit = realHeight;
+                               xInit = yInit * ratio;
+                       } else {
+                               xInit = realWidth;
+                               yInit = xInit / ratio;
+                       }
 
-                               event.preventDefault();
+                       x1 = ( realWidth - xInit ) / 2;
+                       y1 = ( realHeight - yInit ) / 2;
+
+                       imgSelectOptions = {
+                               handles: true,
+                               keys: true,
+                               instance: true,
+                               persistent: true,
+                               imageWidth: realWidth,
+                               imageHeight: realHeight,
+                               minWidth: xImg > xInit ? xInit : xImg,
+                               minHeight: yImg > yInit ? yInit : yImg,
+                               x1: x1,
+                               y1: y1,
+                               x2: xInit + x1,
+                               y2: yInit + y1
+                       };
 
-                               if (!toggleFreeze)
-                                       control.container.toggleClass('open');
+                       if ( flexHeight === false && flexWidth === false ) {
+                               imgSelectOptions.aspectRatio = xInit + ':' + yInit;
+                       }
 
-                               if ( control.container.hasClass('open') )
-                                       control.container.parent().parent().find('li.library-selected').focus();
+                       if ( true === flexHeight ) {
+                               delete imgSelectOptions.minHeight;
+                               imgSelectOptions.maxWidth = realWidth;
+                       }
 
-                               // Don't want to fire focus and click at same time
-                               toggleFreeze = true;
-                               setTimeout(function () {
-                                       toggleFreeze = false;
-                               }, 400);
-                       });
+                       if ( true === flexWidth ) {
+                               delete imgSelectOptions.minWidth;
+                               imgSelectOptions.maxHeight = realHeight;
+                       }
 
-                       this.setting.bind( update );
-                       update( this.setting() );
+                       return imgSelectOptions;
+               },
+
+               /**
+                * Return whether the image must be cropped, based on required dimensions.
+                *
+                * @param {bool} flexW
+                * @param {bool} flexH
+                * @param {int}  dstW
+                * @param {int}  dstH
+                * @param {int}  imgW
+                * @param {int}  imgH
+                * @return {bool}
+                */
+               mustBeCropped: function( flexW, flexH, dstW, dstH, imgW, imgH ) {
+                       if ( true === flexW && true === flexH ) {
+                               return false;
+                       }
+
+                       if ( true === flexW && dstH === imgH ) {
+                               return false;
+                       }
+
+                       if ( true === flexH && dstW === imgW ) {
+                               return false;
+                       }
+
+                       if ( dstW === imgW && dstH === imgH ) {
+                               return false;
+                       }
+
+                       if ( imgW <= dstW ) {
+                               return false;
+                       }
+
+                       return true;
+               },
+
+               /**
+                * If cropping was skipped, apply the image data directly to the setting.
+                */
+               onSkippedCrop: function() {
+                       var attachment = this.frame.state().get( 'selection' ).first().toJSON();
+                       this.setImageFromAttachment( attachment );
+               },
+
+               /**
+                * Updates the setting and re-renders the control UI.
+                *
+                * @param {object} attachment
+                */
+               setImageFromAttachment: function( attachment ) {
+                       this.params.attachment = attachment;
+
+                       // Set the Customizer setting; the callback takes care of rendering.
+                       this.setting( attachment.id );
                }
        });
 
-       api.ColorControl = api.Control.extend({
-               ready: function() {
-                       var control = this,
-                               picker = this.container.find('.color-picker-hex');
+       /**
+        * A control for selecting and cropping Site Icons.
+        *
+        * @class
+        * @augments wp.customize.CroppedImageControl
+        * @augments wp.customize.MediaControl
+        * @augments wp.customize.Control
+        * @augments wp.customize.Class
+        */
+       api.SiteIconControl = api.CroppedImageControl.extend({
+
+               /**
+                * Create a media modal select frame, and store it so the instance can be reused when needed.
+                */
+               initFrame: function() {
+                       var l10n = _wpMediaViewsL10n;
 
-                       picker.val( control.setting() ).wpColorPicker({
-                               change: function() {
-                                       control.setting.set( picker.wpColorPicker('color') );
+                       this.frame = wp.media({
+                               button: {
+                                       text: l10n.select,
+                                       close: false
                                },
-                               clear: function() {
-                                       control.setting.set( false );
-                               }
+                               states: [
+                                       new wp.media.controller.Library({
+                                               title: this.params.button_labels.frame_title,
+                                               library: wp.media.query({ type: 'image' }),
+                                               multiple: false,
+                                               date: false,
+                                               priority: 20,
+                                               suggestedWidth: this.params.width,
+                                               suggestedHeight: this.params.height
+                                       }),
+                                       new wp.media.controller.SiteIconCropper({
+                                               imgSelectOptions: this.calculateImageSelectOptions,
+                                               control: this
+                                       })
+                               ]
                        });
+
+                       this.frame.on( 'select', this.onSelect, this );
+                       this.frame.on( 'cropped', this.onCropped, this );
+                       this.frame.on( 'skippedcrop', this.onSkippedCrop, this );
+               },
+
+               /**
+                * After an image is selected in the media modal, switch to the cropper
+                * state if the image isn't the right size.
+                */
+               onSelect: function() {
+                       var attachment = this.frame.state().get( 'selection' ).first().toJSON(),
+                               controller = this;
+
+                       if ( this.params.width === attachment.width && this.params.height === attachment.height && ! this.params.flex_width && ! this.params.flex_height ) {
+                               wp.ajax.post( 'crop-image', {
+                                       nonce: attachment.nonces.edit,
+                                       id: attachment.id,
+                                       context: 'site-icon',
+                                       cropDetails: {
+                                               x1: 0,
+                                               y1: 0,
+                                               width: this.params.width,
+                                               height: this.params.height,
+                                               dst_width: this.params.width,
+                                               dst_height: this.params.height
+                                       }
+                               } ).done( function( croppedImage ) {
+                                       controller.setImageFromAttachment( croppedImage );
+                                       controller.frame.close();
+                               } ).fail( function() {
+                                       controller.frame.trigger('content:error:crop');
+                               } );
+                       } else {
+                               this.frame.setState( 'cropper' );
+                       }
+               },
+
+               /**
+                * Updates the setting and re-renders the control UI.
+                *
+                * @param {object} attachment
+                */
+               setImageFromAttachment: function( attachment ) {
+                       var sizes = [ 'site_icon-32', 'thumbnail', 'full' ], link,
+                               icon;
+
+                       _.each( sizes, function( size ) {
+                               if ( ! icon && ! _.isUndefined ( attachment.sizes[ size ] ) ) {
+                                       icon = attachment.sizes[ size ];
+                               }
+                       } );
+
+                       this.params.attachment = attachment;
+
+                       // Set the Customizer setting; the callback takes care of rendering.
+                       this.setting( attachment.id );
+
+                       if ( ! icon ) {
+                               return;
+                       }
+
+                       // Update the icon in-browser.
+                       link = $( 'link[rel="icon"][sizes="32x32"]' );
+                       link.attr( 'href', icon.url );
+               },
+
+               /**
+                * Called when the "Remove" link is clicked. Empties the setting.
+                *
+                * @param {object} event jQuery Event object
+                */
+               removeFile: function( event ) {
+                       if ( api.utils.isKeydownButNotEnterEvent( event ) ) {
+                               return;
+                       }
+                       event.preventDefault();
+
+                       this.params.attachment = {};
+                       this.setting( '' );
+                       this.renderContent(); // Not bound to setting change when emptying.
+                       $( 'link[rel="icon"][sizes="32x32"]' ).attr( 'href', '/favicon.ico' ); // Set to default.
                }
        });
 
-       api.UploadControl = api.Control.extend({
+       /**
+        * @class
+        * @augments wp.customize.Control
+        * @augments wp.customize.Class
+        */
+       api.HeaderControl = api.Control.extend({
                ready: function() {
-                       var control = this;
+                       this.btnRemove = $('#customize-control-header_image .actions .remove');
+                       this.btnNew    = $('#customize-control-header_image .actions .new');
+
+                       _.bindAll(this, 'openMedia', 'removeImage');
+
+                       this.btnNew.on( 'click', this.openMedia );
+                       this.btnRemove.on( 'click', this.removeImage );
+
+                       api.HeaderTool.currentHeader = this.getInitialHeaderImage();
+
+                       new api.HeaderTool.CurrentView({
+                               model: api.HeaderTool.currentHeader,
+                               el: '#customize-control-header_image .current .container'
+                       });
+
+                       new api.HeaderTool.ChoiceListView({
+                               collection: api.HeaderTool.UploadsList = new api.HeaderTool.ChoiceList(),
+                               el: '#customize-control-header_image .choices .uploaded .list'
+                       });
 
-                       this.params.removed = this.params.removed || '';
+                       new api.HeaderTool.ChoiceListView({
+                               collection: api.HeaderTool.DefaultsList = new api.HeaderTool.DefaultsList(),
+                               el: '#customize-control-header_image .choices .default .list'
+                       });
+
+                       api.HeaderTool.combinedList = api.HeaderTool.CombinedList = new api.HeaderTool.CombinedList([
+                               api.HeaderTool.UploadsList,
+                               api.HeaderTool.DefaultsList
+                       ]);
 
-                       this.success = $.proxy( this.success, this );
+                       // Ensure custom-header-crop Ajax requests bootstrap the Customizer to activate the previewed theme.
+                       wp.media.controller.Cropper.prototype.defaults.doCropArgs.wp_customize = 'on';
+                       wp.media.controller.Cropper.prototype.defaults.doCropArgs.customize_theme = api.settings.theme.stylesheet;
+               },
 
-                       this.uploader = $.extend({
-                               container: this.container,
-                               browser:   this.container.find('.upload'),
-                               dropzone:  this.container.find('.upload-dropzone'),
-                               success:   this.success,
-                               plupload:  {},
-                               params:    {}
-                       }, this.uploader || {} );
+               /**
+                * Returns a new instance of api.HeaderTool.ImageModel based on the currently
+                * saved header image (if any).
+                *
+                * @since 4.2.0
+                *
+                * @returns {Object} Options
+                */
+               getInitialHeaderImage: function() {
+                       if ( ! api.get().header_image || ! api.get().header_image_data || _.contains( [ 'remove-header', 'random-default-image', 'random-uploaded-image' ], api.get().header_image ) ) {
+                               return new api.HeaderTool.ImageModel();
+                       }
 
-                       if ( control.params.extensions ) {
-                               control.uploader.plupload.filters = [{
-                                       title:      api.l10n.allowedFiles,
-                                       extensions: control.params.extensions
-                               }];
+                       // Get the matching uploaded image object.
+                       var currentHeaderObject = _.find( _wpCustomizeHeader.uploads, function( imageObj ) {
+                               return ( imageObj.attachment_id === api.get().header_image_data.attachment_id );
+                       } );
+                       // Fall back to raw current header image.
+                       if ( ! currentHeaderObject ) {
+                               currentHeaderObject = {
+                                       url: api.get().header_image,
+                                       thumbnail_url: api.get().header_image,
+                                       attachment_id: api.get().header_image_data.attachment_id
+                               };
                        }
 
-                       if ( control.params.context )
-                               control.uploader.params['post_data[context]'] = this.params.context;
+                       return new api.HeaderTool.ImageModel({
+                               header: currentHeaderObject,
+                               choice: currentHeaderObject.url.split( '/' ).pop()
+                       });
+               },
 
-                       if ( api.settings.theme.stylesheet )
-                               control.uploader.params['post_data[theme]'] = api.settings.theme.stylesheet;
+               /**
+                * Returns a set of options, computed from the attached image data and
+                * theme-specific data, to be fed to the imgAreaSelect plugin in
+                * wp.media.view.Cropper.
+                *
+                * @param {wp.media.model.Attachment} attachment
+                * @param {wp.media.controller.Cropper} controller
+                * @returns {Object} Options
+                */
+               calculateImageSelectOptions: function(attachment, controller) {
+                       var xInit = parseInt(_wpCustomizeHeader.data.width, 10),
+                               yInit = parseInt(_wpCustomizeHeader.data.height, 10),
+                               flexWidth = !! parseInt(_wpCustomizeHeader.data['flex-width'], 10),
+                               flexHeight = !! parseInt(_wpCustomizeHeader.data['flex-height'], 10),
+                               ratio, xImg, yImg, realHeight, realWidth,
+                               imgSelectOptions;
+
+                       realWidth = attachment.get('width');
+                       realHeight = attachment.get('height');
+
+                       this.headerImage = new api.HeaderTool.ImageModel();
+                       this.headerImage.set({
+                               themeWidth: xInit,
+                               themeHeight: yInit,
+                               themeFlexWidth: flexWidth,
+                               themeFlexHeight: flexHeight,
+                               imageWidth: realWidth,
+                               imageHeight: realHeight
+                       });
 
-                       this.uploader = new wp.Uploader( this.uploader );
+                       controller.set( 'canSkipCrop', ! this.headerImage.shouldBeCropped() );
 
-                       this.remover = this.container.find('.remove');
-                       this.remover.on( 'click keydown', function( event ) {
-                               if ( event.type === 'keydown' &&  13 !== event.which ) // enter
-                                       return;
+                       ratio = xInit / yInit;
+                       xImg = realWidth;
+                       yImg = realHeight;
 
-                               control.setting.set( control.params.removed );
-                               event.preventDefault();
+                       if ( xImg / yImg > ratio ) {
+                               yInit = yImg;
+                               xInit = yInit * ratio;
+                       } else {
+                               xInit = xImg;
+                               yInit = xInit / ratio;
+                       }
+
+                       imgSelectOptions = {
+                               handles: true,
+                               keys: true,
+                               instance: true,
+                               persistent: true,
+                               imageWidth: realWidth,
+                               imageHeight: realHeight,
+                               x1: 0,
+                               y1: 0,
+                               x2: xInit,
+                               y2: yInit
+                       };
+
+                       if (flexHeight === false && flexWidth === false) {
+                               imgSelectOptions.aspectRatio = xInit + ':' + yInit;
+                       }
+                       if (flexHeight === false ) {
+                               imgSelectOptions.maxHeight = yInit;
+                       }
+                       if (flexWidth === false ) {
+                               imgSelectOptions.maxWidth = xInit;
+                       }
+
+                       return imgSelectOptions;
+               },
+
+               /**
+                * Sets up and opens the Media Manager in order to select an image.
+                * Depending on both the size of the image and the properties of the
+                * current theme, a cropping step after selection may be required or
+                * skippable.
+                *
+                * @param {event} event
+                */
+               openMedia: function(event) {
+                       var l10n = _wpMediaViewsL10n;
+
+                       event.preventDefault();
+
+                       this.frame = wp.media({
+                               button: {
+                                       text: l10n.selectAndCrop,
+                                       close: false
+                               },
+                               states: [
+                                       new wp.media.controller.Library({
+                                               title:     l10n.chooseImage,
+                                               library:   wp.media.query({ type: 'image' }),
+                                               multiple:  false,
+                                               date:      false,
+                                               priority:  20,
+                                               suggestedWidth: _wpCustomizeHeader.data.width,
+                                               suggestedHeight: _wpCustomizeHeader.data.height
+                                       }),
+                                       new wp.media.controller.Cropper({
+                                               imgSelectOptions: this.calculateImageSelectOptions
+                                       })
+                               ]
                        });
 
-                       this.removerVisibility = $.proxy( this.removerVisibility, this );
-                       this.setting.bind( this.removerVisibility );
-                       this.removerVisibility( this.setting.get() );
+                       this.frame.on('select', this.onSelect, this);
+                       this.frame.on('cropped', this.onCropped, this);
+                       this.frame.on('skippedcrop', this.onSkippedCrop, this);
+
+                       this.frame.open();
                },
-               success: function( attachment ) {
-                       this.setting.set( attachment.get('url') );
+
+               /**
+                * After an image is selected in the media modal,
+                * switch to the cropper state.
+                */
+               onSelect: function() {
+                       this.frame.setState('cropper');
                },
-               removerVisibility: function( to ) {
-                       this.remover.toggle( to != this.params.removed );
-               }
-       });
 
-       api.ImageControl = api.UploadControl.extend({
-               ready: function() {
-                       var control = this,
-                               panels;
+               /**
+                * After the image has been cropped, apply the cropped image data to the setting.
+                *
+                * @param {object} croppedImage Cropped attachment data.
+                */
+               onCropped: function(croppedImage) {
+                       var url = croppedImage.url,
+                               attachmentId = croppedImage.attachment_id,
+                               w = croppedImage.width,
+                               h = croppedImage.height;
+                       this.setImageFromURL(url, attachmentId, w, h);
+               },
 
-                       this.uploader = {
-                               init: function() {
-                                       var fallback, button;
+               /**
+                * If cropping was skipped, apply the image data directly to the setting.
+                *
+                * @param {object} selection
+                */
+               onSkippedCrop: function(selection) {
+                       var url = selection.get('url'),
+                               w = selection.get('width'),
+                               h = selection.get('height');
+                       this.setImageFromURL(url, selection.id, w, h);
+               },
 
-                                       if ( this.supports.dragdrop )
-                                               return;
+               /**
+                * Creates a new wp.customize.HeaderTool.ImageModel from provided
+                * header image data and inserts it into the user-uploaded headers
+                * collection.
+                *
+                * @param {String} url
+                * @param {Number} attachmentId
+                * @param {Number} width
+                * @param {Number} height
+                */
+               setImageFromURL: function(url, attachmentId, width, height) {
+                       var choice, data = {};
 
-                                       // Maintain references while wrapping the fallback button.
-                                       fallback = control.container.find( '.upload-fallback' );
-                                       button   = fallback.children().detach();
+                       data.url = url;
+                       data.thumbnail_url = url;
+                       data.timestamp = _.now();
 
-                                       this.browser.detach().empty().append( button );
-                                       fallback.append( this.browser ).show();
-                               }
-                       };
+                       if (attachmentId) {
+                               data.attachment_id = attachmentId;
+                       }
+
+                       if (width) {
+                               data.width = width;
+                       }
+
+                       if (height) {
+                               data.height = height;
+                       }
+
+                       choice = new api.HeaderTool.ImageModel({
+                               header: data,
+                               choice: url.split('/').pop()
+                       });
+                       api.HeaderTool.UploadsList.add(choice);
+                       api.HeaderTool.currentHeader.set(choice.toJSON());
+                       choice.save();
+                       choice.importImage();
+               },
+
+               /**
+                * Triggers the necessary events to deselect an image which was set as
+                * the currently selected one.
+                */
+               removeImage: function() {
+                       api.HeaderTool.currentHeader.trigger('hide');
+                       api.HeaderTool.CombinedList.trigger('control:removeImage');
+               }
 
-                       api.UploadControl.prototype.ready.call( this );
+       });
 
-                       this.thumbnail    = this.container.find('.preview-thumbnail img');
-                       this.thumbnailSrc = $.proxy( this.thumbnailSrc, this );
-                       this.setting.bind( this.thumbnailSrc );
+       /**
+        * wp.customize.ThemeControl
+        *
+        * @constructor
+        * @augments wp.customize.Control
+        * @augments wp.customize.Class
+        */
+       api.ThemeControl = api.Control.extend({
 
-                       this.library = this.container.find('.library');
+               touchDrag: false,
+               isRendered: false,
 
-                       // Generate tab objects
-                       this.tabs = {};
-                       panels    = this.library.find('.library-content');
+               /**
+                * Defer rendering the theme control until the section is displayed.
+                *
+                * @since 4.2.0
+                */
+               renderContent: function () {
+                       var control = this,
+                               renderContentArgs = arguments;
 
-                       this.library.children('ul').children('li').each( function() {
-                               var link  = $(this),
-                                       id    = link.data('customizeTab'),
-                                       panel = panels.filter('[data-customize-tab="' + id + '"]');
+                       api.section( control.section(), function( section ) {
+                               if ( section.expanded() ) {
+                                       api.Control.prototype.renderContent.apply( control, renderContentArgs );
+                                       control.isRendered = true;
+                               } else {
+                                       section.expanded.bind( function( expanded ) {
+                                               if ( expanded && ! control.isRendered ) {
+                                                       api.Control.prototype.renderContent.apply( control, renderContentArgs );
+                                                       control.isRendered = true;
+                                               }
+                                       } );
+                               }
+                       } );
+               },
 
-                               control.tabs[ id ] = {
-                                       both:  link.add( panel ),
-                                       link:  link,
-                                       panel: panel
-                               };
+               /**
+                * @since 4.2.0
+                */
+               ready: function() {
+                       var control = this;
+
+                       control.container.on( 'touchmove', '.theme', function() {
+                               control.touchDrag = true;
                        });
 
-                       // Bind tab switch events
-                       this.library.children('ul').on( 'click keydown', 'li', function( event ) {
-                               if ( event.type === 'keydown' &&  13 !== event.which ) // enter
+                       // Bind details view trigger.
+                       control.container.on( 'click keydown touchend', '.theme', function( event ) {
+                               if ( api.utils.isKeydownButNotEnterEvent( event ) ) {
                                        return;
+                               }
 
-                               var id  = $(this).data('customizeTab'),
-                                       tab = control.tabs[ id ];
-
-                               event.preventDefault();
+                               // Bail if the user scrolled on a touch device.
+                               if ( control.touchDrag === true ) {
+                                       return control.touchDrag = false;
+                               }
 
-                               if ( tab.link.hasClass('library-selected') )
+                               // Prevent the modal from showing when the user clicks the action button.
+                               if ( $( event.target ).is( '.theme-actions .button' ) ) {
                                        return;
+                               }
 
-                               control.selected.both.removeClass('library-selected');
-                               control.selected = tab;
-                               control.selected.both.addClass('library-selected');
+                               api.section( control.section() ).loadThemePreview( control.params.theme.id );
                        });
 
-                       // Bind events to switch image urls.
-                       this.library.on( 'click keydown', 'a', function( event ) {
-                               if ( event.type === 'keydown' && 13 !== event.which ) // enter
+                       control.container.on( 'click keydown', '.theme-actions .theme-details', function( event ) {
+                               if ( api.utils.isKeydownButNotEnterEvent( event ) ) {
                                        return;
+                               }
 
-                               var value = $(this).data('customizeImageValue');
+                               event.preventDefault(); // Keep this AFTER the key filter above
 
-                               if ( value ) {
-                                       control.setting.set( value );
-                                       event.preventDefault();
-                               }
+                               api.section( control.section() ).showDetails( control.params.theme );
                        });
 
-                       if ( this.tabs.uploaded ) {
-                               this.tabs.uploaded.target = this.library.find('.uploaded-target');
-                               if ( ! this.tabs.uploaded.panel.find('.thumbnail').length )
-                                       this.tabs.uploaded.both.addClass('hidden');
-                       }
-
-                       // Select a tab
-                       panels.each( function() {
-                               var tab = control.tabs[ $(this).data('customizeTab') ];
+                       control.container.on( 'render-screenshot', function() {
+                               var $screenshot = $( this ).find( 'img' ),
+                                       source = $screenshot.data( 'src' );
 
-                               // Select the first visible tab.
-                               if ( ! tab.link.hasClass('hidden') ) {
-                                       control.selected = tab;
-                                       tab.both.addClass('library-selected');
-                                       return false;
+                               if ( source ) {
+                                       $screenshot.attr( 'src', source );
                                }
                        });
-
-                       this.dropdownInit();
                },
-               success: function( attachment ) {
-                       api.UploadControl.prototype.success.call( this, attachment );
-
-                       // Add the uploaded image to the uploaded tab.
-                       if ( this.tabs.uploaded && this.tabs.uploaded.target.length ) {
-                               this.tabs.uploaded.both.removeClass('hidden');
 
-                               // @todo: Do NOT store this on the attachment model. That is bad.
-                               attachment.element = $( '<a href="#" class="thumbnail"></a>' )
-                                       .data( 'customizeImageValue', attachment.get('url') )
-                                       .append( '<img src="' +  attachment.get('url')+ '" />' )
-                                       .appendTo( this.tabs.uploaded.target );
+               /**
+                * Show or hide the theme based on the presence of the term in the title, description, and author.
+                *
+                * @since 4.2.0
+                */
+               filter: function( term ) {
+                       var control = this,
+                               haystack = control.params.theme.name + ' ' +
+                                       control.params.theme.description + ' ' +
+                                       control.params.theme.tags + ' ' +
+                                       control.params.theme.author;
+                       haystack = haystack.toLowerCase().replace( '-', ' ' );
+                       if ( -1 !== haystack.search( term ) ) {
+                               control.activate();
+                       } else {
+                               control.deactivate();
                        }
-               },
-               thumbnailSrc: function( to ) {
-                       if ( /^(https?:)?\/\//.test( to ) )
-                               this.thumbnail.prop( 'src', to ).show();
-                       else
-                               this.thumbnail.hide();
                }
        });
 
        // Change objects contained within the main customize object to Settings.
        api.defaultConstructor = api.Setting;
 
-       // Create the collection of Control objects.
+       // Create the collections for Controls, Sections and Panels.
        api.control = new api.Values({ defaultConstructor: api.Control });
+       api.section = new api.Values({ defaultConstructor: api.Section });
+       api.panel = new api.Values({ defaultConstructor: api.Panel });
 
+       /**
+        * An object that fetches a preview in the background of the document, which
+        * allows for seamless replacement of an existing preview.
+        *
+        * @class
+        * @augments wp.customize.Messenger
+        * @augments wp.customize.Class
+        * @mixes wp.customize.Events
+        */
        api.PreviewFrame = api.Messenger.extend({
-               sensitivity: 2000,
+               sensitivity: null, // Will get set to api.settings.timeouts.previewFrameSensitivity.
 
+               /**
+                * Initialize the PreviewFrame.
+                *
+                * @param {object} params.container
+                * @param {object} params.previewUrl
+                * @param {object} params.query
+                * @param {object} options
+                */
                initialize: function( params, options ) {
                        var deferred = $.Deferred();
 
-                       // This is the promise object.
+                       /*
+                        * Make the instance of the PreviewFrame the promise object
+                        * so other objects can easily interact with it.
+                        */
                        deferred.promise( this );
 
                        this.container = params.container;
-                       this.signature = params.signature;
 
                        $.extend( params, { channel: api.PreviewFrame.uuid() });
 
                        this.run( deferred );
                },
 
+               /**
+                * Run the preview request.
+                *
+                * @param {object} deferred jQuery Deferred object to be resolved with
+                *                          the request.
+                */
                run: function( deferred ) {
-                       var self   = this,
+                       var previewFrame = this,
                                loaded = false,
-                               ready  = false;
-
-                       if ( this._ready )
-                               this.unbind( 'ready', this._ready );
+                               ready = false,
+                               readyData = null,
+                               hasPendingChangesetUpdate = '{}' !== previewFrame.query.customized,
+                               urlParser,
+                               params,
+                               form;
+
+                       if ( previewFrame._ready ) {
+                               previewFrame.unbind( 'ready', previewFrame._ready );
+                       }
 
-                       this._ready = function() {
+                       previewFrame._ready = function( data ) {
                                ready = true;
+                               readyData = data;
+                               previewFrame.container.addClass( 'iframe-ready' );
+                               if ( ! data ) {
+                                       return;
+                               }
 
-                               if ( loaded )
-                                       deferred.resolveWith( self );
+                               if ( loaded ) {
+                                       deferred.resolveWith( previewFrame, [ data ] );
+                               }
                        };
 
-                       this.bind( 'ready', this._ready );
+                       previewFrame.bind( 'ready', previewFrame._ready );
+
+                       urlParser = document.createElement( 'a' );
+                       urlParser.href = previewFrame.previewUrl();
 
-                       this.request = $.ajax( this.previewUrl(), {
-                               type: 'POST',
-                               data: this.query,
-                               xhrFields: {
-                                       withCredentials: true
+                       params = _.extend(
+                               api.utils.parseQueryString( urlParser.search.substr( 1 ) ),
+                               {
+                                       customize_changeset_uuid: previewFrame.query.customize_changeset_uuid,
+                                       customize_theme: previewFrame.query.customize_theme,
+                                       customize_messenger_channel: previewFrame.query.customize_messenger_channel
                                }
+                       );
+
+                       urlParser.search = $.param( params );
+                       previewFrame.iframe = $( '<iframe />', {
+                               title: api.l10n.previewIframeTitle,
+                               name: 'customize-' + previewFrame.channel()
                        } );
+                       previewFrame.iframe.attr( 'onmousewheel', '' ); // Workaround for Safari bug. See WP Trac #38149.
 
-                       this.request.fail( function() {
-                               deferred.rejectWith( self, [ 'request failure' ] );
-                       });
+                       if ( ! hasPendingChangesetUpdate ) {
+                               previewFrame.iframe.attr( 'src', urlParser.href );
+                       } else {
+                               previewFrame.iframe.attr( 'data-src', urlParser.href ); // For debugging purposes.
+                       }
 
-                       this.request.done( function( response ) {
-                               var location = self.request.getResponseHeader('Location'),
-                                       signature = self.signature,
-                                       index;
+                       previewFrame.iframe.appendTo( previewFrame.container );
+                       previewFrame.targetWindow( previewFrame.iframe[0].contentWindow );
 
-                               // Check if the location response header differs from the current URL.
-                               // If so, the request was redirected; try loading the requested page.
-                               if ( location && location != self.previewUrl() ) {
-                                       deferred.rejectWith( self, [ 'redirect', location ] );
-                                       return;
-                               }
+                       /*
+                        * Submit customized data in POST request to preview frame window since
+                        * there are setting value changes not yet written to changeset.
+                        */
+                       if ( hasPendingChangesetUpdate ) {
+                               form = $( '<form>', {
+                                       action: urlParser.href,
+                                       target: previewFrame.iframe.attr( 'name' ),
+                                       method: 'post',
+                                       hidden: 'hidden'
+                               } );
+                               form.append( $( '<input>', {
+                                       type: 'hidden',
+                                       name: '_method',
+                                       value: 'GET'
+                               } ) );
+                               _.each( previewFrame.query, function( value, key ) {
+                                       form.append( $( '<input>', {
+                                               type: 'hidden',
+                                               name: key,
+                                               value: value
+                                       } ) );
+                               } );
+                               previewFrame.container.append( form );
+                               form.submit();
+                               form.remove(); // No need to keep the form around after submitted.
+                       }
+
+                       previewFrame.bind( 'iframe-loading-error', function( error ) {
+                               previewFrame.iframe.remove();
 
                                // Check if the user is not logged in.
-                               if ( '0' === response ) {
-                                       self.login( deferred );
+                               if ( 0 === error ) {
+                                       previewFrame.login( deferred );
                                        return;
                                }
 
                                // Check for cheaters.
-                               if ( '-1' === response ) {
-                                       deferred.rejectWith( self, [ 'cheatin' ] );
-                                       return;
-                               }
-
-                               // Check for a signature in the request.
-                               index = response.lastIndexOf( signature );
-                               if ( -1 === index || index < response.lastIndexOf('</html>') ) {
-                                       deferred.rejectWith( self, [ 'unsigned' ] );
+                               if ( -1 === error ) {
+                                       deferred.rejectWith( previewFrame, [ 'cheatin' ] );
                                        return;
                                }
 
-                               // Strip the signature from the request.
-                               response = response.slice( 0, index ) + response.slice( index + signature.length );
-
-                               // Create the iframe and inject the html content.
-                               self.iframe = $('<iframe />').appendTo( self.container );
-
-                               // Bind load event after the iframe has been added to the page;
-                               // otherwise it will fire when injected into the DOM.
-                               self.iframe.one( 'load', function() {
-                                       loaded = true;
-
-                                       if ( ready ) {
-                                               deferred.resolveWith( self );
-                                       } else {
-                                               setTimeout( function() {
-                                                       deferred.rejectWith( self, [ 'ready timeout' ] );
-                                               }, self.sensitivity );
-                                       }
-                               });
+                               deferred.rejectWith( previewFrame, [ 'request failure' ] );
+                       } );
 
-                               self.targetWindow( self.iframe[0].contentWindow );
+                       previewFrame.iframe.one( 'load', function() {
+                               loaded = true;
 
-                               self.targetWindow().document.open();
-                               self.targetWindow().document.write( response );
-                               self.targetWindow().document.close();
+                               if ( ready ) {
+                                       deferred.resolveWith( previewFrame, [ readyData ] );
+                               } else {
+                                       setTimeout( function() {
+                                               deferred.rejectWith( previewFrame, [ 'ready timeout' ] );
+                                       }, previewFrame.sensitivity );
+                               }
                        });
                },
 
                                deferred.rejectWith( self, [ 'logged out' ] );
                        };
 
-                       if ( this.triedLogin )
+                       if ( this.triedLogin ) {
                                return reject();
+                       }
 
                        // Check if we have an admin cookie.
                        $.get( api.settings.url.ajax, {
                        }).fail( reject ).done( function( response ) {
                                var iframe;
 
-                               if ( '1' !== response )
+                               if ( '1' !== response ) {
                                        reject();
+                               }
 
-                               iframe = $('<iframe src="' + self.previewUrl() + '" />').hide();
+                               iframe = $( '<iframe />', { 'src': self.previewUrl(), 'title': api.l10n.previewIframeTitle } ).hide();
                                iframe.appendTo( self.container );
-                               iframe.load( function() {
+                               iframe.on( 'load', function() {
                                        self.triedLogin = true;
 
                                        iframe.remove();
 
                destroy: function() {
                        api.Messenger.prototype.destroy.call( this );
-                       this.request.abort();
 
-                       if ( this.iframe )
+                       if ( this.iframe ) {
                                this.iframe.remove();
+                       }
 
-                       delete this.request;
                        delete this.iframe;
                        delete this.targetWindow;
                }
        });
 
        (function(){
-               var uuid = 0;
+               var id = 0;
+               /**
+                * Return an incremented ID for a preview messenger channel.
+                *
+                * This function is named "uuid" for historical reasons, but it is a
+                * misnomer as it is not an actual UUID, and it is not universally unique.
+                * This is not to be confused with `api.settings.changeset.uuid`.
+                *
+                * @return {string}
+                */
                api.PreviewFrame.uuid = function() {
-                       return 'preview-' + uuid++;
+                       return 'preview-' + String( id++ );
                };
        }());
 
+       /**
+        * Set the document title of the customizer.
+        *
+        * @since 4.1.0
+        *
+        * @param {string} documentTitle
+        */
+       api.setDocumentTitle = function ( documentTitle ) {
+               var tmpl, title;
+               tmpl = api.settings.documentTitleTmpl;
+               title = tmpl.replace( '%s', documentTitle );
+               document.title = title;
+               api.trigger( 'title', title );
+       };
+
+       /**
+        * @class
+        * @augments wp.customize.Messenger
+        * @augments wp.customize.Class
+        * @mixes wp.customize.Events
+        */
        api.Previewer = api.Messenger.extend({
-               refreshBuffer: 250,
+               refreshBuffer: null, // Will get set to api.settings.timeouts.windowRefresh.
 
                /**
-                * Requires params:
-                *  - container  - a selector or jQuery element
-                *  - previewUrl - the URL of preview frame
+                * @param {array}  params.allowedUrls
+                * @param {string} params.container   A selector or jQuery element for the preview
+                *                                    frame to be placed.
+                * @param {string} params.form
+                * @param {string} params.previewUrl  The URL to preview.
+                * @param {object} options
                 */
                initialize: function( params, options ) {
-                       var self = this,
-                               rscheme = /^https?/;
-
-                       $.extend( this, options || {} );
+                       var previewer = this,
+                               urlParser = document.createElement( 'a' );
 
-                       /*
-                        * Wrap this.refresh to prevent it from hammering the servers:
-                        *
-                        * If refresh is called once and no other refresh requests are
-                        * loading, trigger the request immediately.
-                        *
-                        * If refresh is called while another refresh request is loading,
-                        * debounce the refresh requests:
-                        * 1. Stop the loading request (as it is instantly outdated).
-                        * 2. Trigger the new request once refresh hasn't been called for
-                        *    self.refreshBuffer milliseconds.
-                        */
-                       this.refresh = (function( self ) {
-                               var refresh  = self.refresh,
-                                       callback = function() {
-                                               timeout = null;
-                                               refresh.call( self );
-                                       },
-                                       timeout;
+                       $.extend( previewer, options || {} );
+                       previewer.deferred = {
+                               active: $.Deferred()
+                       };
 
-                               return function() {
-                                       if ( typeof timeout !== 'number' ) {
-                                               if ( self.loading ) {
-                                                       self.abort();
+                       // Debounce to prevent hammering server and then wait for any pending update requests.
+                       previewer.refresh = _.debounce(
+                               ( function( originalRefresh ) {
+                                       return function() {
+                                               var isProcessingComplete, refreshOnceProcessingComplete;
+                                               isProcessingComplete = function() {
+                                                       return 0 === api.state( 'processing' ).get();
+                                               };
+                                               if ( isProcessingComplete() ) {
+                                                       originalRefresh.call( previewer );
                                                } else {
-                                                       return callback();
+                                                       refreshOnceProcessingComplete = function() {
+                                                               if ( isProcessingComplete() ) {
+                                                                       originalRefresh.call( previewer );
+                                                                       api.state( 'processing' ).unbind( refreshOnceProcessingComplete );
+                                                               }
+                                                       };
+                                                       api.state( 'processing' ).bind( refreshOnceProcessingComplete );
                                                }
-                                       }
-
-                                       clearTimeout( timeout );
-                                       timeout = setTimeout( callback, self.refreshBuffer );
-                               };
-                       })( this );
+                                       };
+                               }( previewer.refresh ) ),
+                               previewer.refreshBuffer
+                       );
 
-                       this.container   = api.ensure( params.container );
-                       this.allowedUrls = params.allowedUrls;
-                       this.signature   = params.signature;
+                       previewer.container   = api.ensure( params.container );
+                       previewer.allowedUrls = params.allowedUrls;
 
                        params.url = window.location.href;
 
-                       api.Messenger.prototype.initialize.call( this, params );
+                       api.Messenger.prototype.initialize.call( previewer, params );
 
-                       this.add( 'scheme', this.origin() ).link( this.origin ).setter( function( to ) {
-                               var match = to.match( rscheme );
-                               return match ? match[0] : '';
-                       });
+                       urlParser.href = previewer.origin();
+                       previewer.add( 'scheme', urlParser.protocol.replace( /:$/, '' ) );
 
                        // Limit the URL to internal, front-end links.
                        //
-                       // If the frontend and the admin are served from the same domain, load the
-                       // preview over ssl if the customizer is being loaded over ssl. This avoids
-                       // insecure content warnings. This is not attempted if the admin and frontend
-                       // are on different domains to avoid the case where the frontend doesn't have
+                       // If the front end and the admin are served from the same domain, load the
+                       // preview over ssl if the Customizer is being loaded over ssl. This avoids
+                       // insecure content warnings. This is not attempted if the admin and front end
+                       // are on different domains to avoid the case where the front end doesn't have
                        // ssl certs.
 
-                       this.add( 'previewUrl', params.previewUrl ).setter( function( to ) {
-                               var result;
+                       previewer.add( 'previewUrl', params.previewUrl ).setter( function( to ) {
+                               var result = null, urlParser, queryParams, parsedAllowedUrl, parsedCandidateUrls = [];
+                               urlParser = document.createElement( 'a' );
+                               urlParser.href = to;
 
-                               // Check for URLs that include "/wp-admin/" or end in "/wp-admin".
-                               // Strip hashes and query strings before testing.
-                               if ( /\/wp-admin(\/|$)/.test( to.replace( /[#?].*$/, '' ) ) )
+                               // Abort if URL is for admin or (static) files in wp-includes or wp-content.
+                               if ( /\/wp-(admin|includes|content)(\/|$)/.test( urlParser.pathname ) ) {
                                        return null;
+                               }
+
+                               // Remove state query params.
+                               if ( urlParser.search.length > 1 ) {
+                                       queryParams = api.utils.parseQueryString( urlParser.search.substr( 1 ) );
+                                       delete queryParams.customize_changeset_uuid;
+                                       delete queryParams.customize_theme;
+                                       delete queryParams.customize_messenger_channel;
+                                       if ( _.isEmpty( queryParams ) ) {
+                                               urlParser.search = '';
+                                       } else {
+                                               urlParser.search = $.param( queryParams );
+                                       }
+                               }
 
-                               // Attempt to match the URL to the control frame's scheme
-                               // and check if it's allowed. If not, try the original URL.
-                               $.each([ to.replace( rscheme, self.scheme() ), to ], function( i, url ) {
-                                       $.each( self.allowedUrls, function( i, allowed ) {
-                                               var path;
+                               parsedCandidateUrls.push( urlParser );
 
-                                               allowed = allowed.replace( /\/+$/, '' );
-                                               path = url.replace( allowed, '' );
+                               // Prepend list with URL that matches the scheme/protocol of the iframe.
+                               if ( previewer.scheme.get() + ':' !== urlParser.protocol ) {
+                                       urlParser = document.createElement( 'a' );
+                                       urlParser.href = parsedCandidateUrls[0].href;
+                                       urlParser.protocol = previewer.scheme.get() + ':';
+                                       parsedCandidateUrls.unshift( urlParser );
+                               }
 
-                                               if ( 0 === url.indexOf( allowed ) && /^([/#?]|$)/.test( path ) ) {
-                                                       result = url;
-                                                       return false;
+                               // Attempt to match the URL to the control frame's scheme and check if it's allowed. If not, try the original URL.
+                               parsedAllowedUrl = document.createElement( 'a' );
+                               _.find( parsedCandidateUrls, function( parsedCandidateUrl ) {
+                                       return ! _.isUndefined( _.find( previewer.allowedUrls, function( allowedUrl ) {
+                                               parsedAllowedUrl.href = allowedUrl;
+                                               if ( urlParser.protocol === parsedAllowedUrl.protocol && urlParser.host === parsedAllowedUrl.host && 0 === urlParser.pathname.indexOf( parsedAllowedUrl.pathname.replace( /\/$/, '' ) ) ) {
+                                                       result = parsedCandidateUrl.href;
+                                                       return true;
                                                }
-                                       });
-                                       if ( result )
-                                               return false;
-                               });
+                                       } ) );
+                               } );
 
-                               // If we found a matching result, return it. If not, bail.
-                               return result ? result : null;
+                               return result;
                        });
 
+                       previewer.bind( 'ready', previewer.ready );
+
+                       // Start listening for keep-alive messages when iframe first loads.
+                       previewer.deferred.active.done( _.bind( previewer.keepPreviewAlive, previewer ) );
+
+                       previewer.bind( 'synced', function() {
+                               previewer.send( 'active' );
+                       } );
+
                        // Refresh the preview when the URL is changed (but not yet).
-                       this.previewUrl.bind( this.refresh );
+                       previewer.previewUrl.bind( previewer.refresh );
 
-                       this.scroll = 0;
-                       this.bind( 'scroll', function( distance ) {
-                               this.scroll = distance;
+                       previewer.scroll = 0;
+                       previewer.bind( 'scroll', function( distance ) {
+                               previewer.scroll = distance;
                        });
 
-                       // Update the URL when the iframe sends a URL message.
-                       this.bind( 'url', this.previewUrl );
+                       // Update the URL when the iframe sends a URL message, resetting scroll position. If URL is unchanged, then refresh.
+                       previewer.bind( 'url', function( url ) {
+                               var onUrlChange, urlChanged = false;
+                               previewer.scroll = 0;
+                               onUrlChange = function() {
+                                       urlChanged = true;
+                               };
+                               previewer.previewUrl.bind( onUrlChange );
+                               previewer.previewUrl.set( url );
+                               previewer.previewUrl.unbind( onUrlChange );
+                               if ( ! urlChanged ) {
+                                       previewer.refresh();
+                               }
+                       } );
+
+                       // Update the document title when the preview changes.
+                       previewer.bind( 'documentTitle', function ( title ) {
+                               api.setDocumentTitle( title );
+                       } );
+               },
+
+               /**
+                * Handle the preview receiving the ready message.
+                *
+                * @since 4.7.0
+                * @access public
+                *
+                * @param {object} data - Data from preview.
+                * @param {string} data.currentUrl - Current URL.
+                * @param {object} data.activePanels - Active panels.
+                * @param {object} data.activeSections Active sections.
+                * @param {object} data.activeControls Active controls.
+                * @returns {void}
+                */
+               ready: function( data ) {
+                       var previewer = this, synced = {}, constructs;
+
+                       synced.settings = api.get();
+                       synced['settings-modified-while-loading'] = previewer.settingsModifiedWhileLoading;
+                       if ( 'resolved' !== previewer.deferred.active.state() || previewer.loading ) {
+                               synced.scroll = previewer.scroll;
+                       }
+                       synced['edit-shortcut-visibility'] = api.state( 'editShortcutVisibility' ).get();
+                       previewer.send( 'sync', synced );
+
+                       // Set the previewUrl without causing the url to set the iframe.
+                       if ( data.currentUrl ) {
+                               previewer.previewUrl.unbind( previewer.refresh );
+                               previewer.previewUrl.set( data.currentUrl );
+                               previewer.previewUrl.bind( previewer.refresh );
+                       }
+
+                       /*
+                        * Walk over all panels, sections, and controls and set their
+                        * respective active states to true if the preview explicitly
+                        * indicates as such.
+                        */
+                       constructs = {
+                               panel: data.activePanels,
+                               section: data.activeSections,
+                               control: data.activeControls
+                       };
+                       _( constructs ).each( function ( activeConstructs, type ) {
+                               api[ type ].each( function ( construct, id ) {
+                                       var isDynamicallyCreated = _.isUndefined( api.settings[ type + 's' ][ id ] );
+
+                                       /*
+                                        * If the construct was created statically in PHP (not dynamically in JS)
+                                        * then consider a missing (undefined) value in the activeConstructs to
+                                        * mean it should be deactivated (since it is gone). But if it is
+                                        * dynamically created then only toggle activation if the value is defined,
+                                        * as this means that the construct was also then correspondingly
+                                        * created statically in PHP and the active callback is available.
+                                        * Otherwise, dynamically-created constructs should normally have
+                                        * their active states toggled in JS rather than from PHP.
+                                        */
+                                       if ( ! isDynamicallyCreated || ! _.isUndefined( activeConstructs[ id ] ) ) {
+                                               if ( activeConstructs[ id ] ) {
+                                                       construct.activate();
+                                               } else {
+                                                       construct.deactivate();
+                                               }
+                                       }
+                               } );
+                       } );
+
+                       if ( data.settingValidities ) {
+                               api._handleSettingValidities( {
+                                       settingValidities: data.settingValidities,
+                                       focusInvalidControl: false
+                               } );
+                       }
+               },
+
+               /**
+                * Keep the preview alive by listening for ready and keep-alive messages.
+                *
+                * If a message is not received in the allotted time then the iframe will be set back to the last known valid URL.
+                *
+                * @since 4.7.0
+                * @access public
+                *
+                * @returns {void}
+                */
+               keepPreviewAlive: function keepPreviewAlive() {
+                       var previewer = this, keepAliveTick, timeoutId, handleMissingKeepAlive, scheduleKeepAliveCheck;
+
+                       /**
+                        * Schedule a preview keep-alive check.
+                        *
+                        * Note that if a page load takes longer than keepAliveCheck milliseconds,
+                        * the keep-alive messages will still be getting sent from the previous
+                        * URL.
+                        */
+                       scheduleKeepAliveCheck = function() {
+                               timeoutId = setTimeout( handleMissingKeepAlive, api.settings.timeouts.keepAliveCheck );
+                       };
+
+                       /**
+                        * Set the previewerAlive state to true when receiving a message from the preview.
+                        */
+                       keepAliveTick = function() {
+                               api.state( 'previewerAlive' ).set( true );
+                               clearTimeout( timeoutId );
+                               scheduleKeepAliveCheck();
+                       };
+
+                       /**
+                        * Set the previewerAlive state to false if keepAliveCheck milliseconds have transpired without a message.
+                        *
+                        * This is most likely to happen in the case of a connectivity error, or if the theme causes the browser
+                        * to navigate to a non-allowed URL. Setting this state to false will force settings with a postMessage
+                        * transport to use refresh instead, causing the preview frame also to be replaced with the current
+                        * allowed preview URL.
+                        */
+                       handleMissingKeepAlive = function() {
+                               api.state( 'previewerAlive' ).set( false );
+                       };
+                       scheduleKeepAliveCheck();
+
+                       previewer.bind( 'ready', keepAliveTick );
+                       previewer.bind( 'keep-alive', keepAliveTick );
                },
 
+               /**
+                * Query string data sent with each preview request.
+                *
+                * @abstract
+                */
                query: function() {},
 
                abort: function() {
                        }
                },
 
+               /**
+                * Refresh the preview seamlessly.
+                *
+                * @since 3.4.0
+                * @access public
+                * @returns {void}
+                */
                refresh: function() {
-                       var self = this;
+                       var previewer = this, onSettingChange;
+
+                       // Display loading indicator
+                       previewer.send( 'loading-initiated' );
 
-                       this.abort();
+                       previewer.abort();
 
-                       this.loading = new api.PreviewFrame({
-                               url:        this.url(),
-                               previewUrl: this.previewUrl(),
-                               query:      this.query() || {},
-                               container:  this.container,
-                               signature:  this.signature
+                       previewer.loading = new api.PreviewFrame({
+                               url:        previewer.url(),
+                               previewUrl: previewer.previewUrl(),
+                               query:      previewer.query( { excludeCustomizedSaved: true } ) || {},
+                               container:  previewer.container
                        });
 
-                       this.loading.done( function() {
-                               // 'this' is the loading frame
-                               this.bind( 'synced', function() {
-                                       if ( self.preview )
-                                               self.preview.destroy();
-                                       self.preview = this;
-                                       delete self.loading;
+                       previewer.settingsModifiedWhileLoading = {};
+                       onSettingChange = function( setting ) {
+                               previewer.settingsModifiedWhileLoading[ setting.id ] = true;
+                       };
+                       api.bind( 'change', onSettingChange );
+                       previewer.loading.always( function() {
+                               api.unbind( 'change', onSettingChange );
+                       } );
+
+                       previewer.loading.done( function( readyData ) {
+                               var loadingFrame = this, onceSynced;
 
-                                       self.targetWindow( this.targetWindow() );
-                                       self.channel( this.channel() );
+                               previewer.preview = loadingFrame;
+                               previewer.targetWindow( loadingFrame.targetWindow() );
+                               previewer.channel( loadingFrame.channel() );
 
-                                       self.send( 'active' );
-                               });
+                               onceSynced = function() {
+                                       loadingFrame.unbind( 'synced', onceSynced );
+                                       if ( previewer._previousPreview ) {
+                                               previewer._previousPreview.destroy();
+                                       }
+                                       previewer._previousPreview = previewer.preview;
+                                       previewer.deferred.active.resolve();
+                                       delete previewer.loading;
+                               };
+                               loadingFrame.bind( 'synced', onceSynced );
 
-                               this.send( 'sync', {
-                                       scroll:   self.scroll,
-                                       settings: api.get()
-                               });
+                               // This event will be received directly by the previewer in normal navigation; this is only needed for seamless refresh.
+                               previewer.trigger( 'ready', readyData );
                        });
 
-                       this.loading.fail( function( reason, location ) {
-                               if ( 'redirect' === reason && location )
-                                       self.previewUrl( location );
+                       previewer.loading.fail( function( reason ) {
+                               previewer.send( 'loading-failed' );
 
                                if ( 'logged out' === reason ) {
-                                       if ( self.preview ) {
-                                               self.preview.destroy();
-                                               delete self.preview;
+                                       if ( previewer.preview ) {
+                                               previewer.preview.destroy();
+                                               delete previewer.preview;
                                        }
 
-                                       self.login().done( self.refresh );
+                                       previewer.login().done( previewer.refresh );
                                }
 
-                               if ( 'cheatin' === reason )
-                                       self.cheatin();
+                               if ( 'cheatin' === reason ) {
+                                       previewer.cheatin();
+                               }
                        });
                },
 
                                url:     api.settings.url.login
                        });
 
-                       iframe = $('<iframe src="' + api.settings.url.login + '" />').appendTo( this.container );
+                       iframe = $( '<iframe />', { 'src': api.settings.url.login, 'title': api.l10n.loginIframeTitle } ).appendTo( this.container );
 
                        messenger.targetWindow( iframe[0].contentWindow );
 
-                       messenger.bind( 'login', function() {
-                               iframe.remove();
-                               messenger.destroy();
-                               delete previewer._login;
-                               deferred.resolve();
+                       messenger.bind( 'login', function () {
+                               var refreshNonces = previewer.refreshNonces();
+
+                               refreshNonces.always( function() {
+                                       iframe.remove();
+                                       messenger.destroy();
+                                       delete previewer._login;
+                               });
+
+                               refreshNonces.done( function() {
+                                       deferred.resolve();
+                               });
+
+                               refreshNonces.fail( function() {
+                                       previewer.cheatin();
+                                       deferred.reject();
+                               });
                        });
 
                        return this._login;
                },
 
                cheatin: function() {
-                       $( document.body ).empty().addClass('cheatin').append( '<p>' + api.l10n.cheatin + '</p>' );
+                       $( document.body ).empty().addClass( 'cheatin' ).append(
+                               '<h1>' + api.l10n.cheatin + '</h1>' +
+                               '<p>' + api.l10n.notAllowed + '</p>'
+                       );
+               },
+
+               refreshNonces: function() {
+                       var request, deferred = $.Deferred();
+
+                       deferred.promise();
+
+                       request = wp.ajax.post( 'customize_refresh_nonces', {
+                               wp_customize: 'on',
+                               customize_theme: api.settings.theme.stylesheet
+                       });
+
+                       request.done( function( response ) {
+                               api.trigger( 'nonce-refresh', response );
+                               deferred.resolve();
+                       });
+
+                       request.fail( function() {
+                               deferred.reject();
+                       });
+
+                       return deferred;
                }
        });
 
-       /* =====================================================================
-        * Ready.
-        * ===================================================================== */
-
+       api.settingConstructor = {};
        api.controlConstructor = {
-               color:  api.ColorControl,
-               upload: api.UploadControl,
-               image:  api.ImageControl
+               color:               api.ColorControl,
+               media:               api.MediaControl,
+               upload:              api.UploadControl,
+               image:               api.ImageControl,
+               cropped_image:       api.CroppedImageControl,
+               site_icon:           api.SiteIconControl,
+               header:              api.HeaderControl,
+               background:          api.BackgroundControl,
+               background_position: api.BackgroundPositionControl,
+               theme:               api.ThemeControl
+       };
+       api.panelConstructor = {};
+       api.sectionConstructor = {
+               themes: api.ThemesSection
+       };
+
+       /**
+        * Handle setting_validities in an error response for the customize-save request.
+        *
+        * Add notifications to the settings and focus on the first control that has an invalid setting.
+        *
+        * @since 4.6.0
+        * @private
+        *
+        * @param {object}  args
+        * @param {object}  args.settingValidities
+        * @param {boolean} [args.focusInvalidControl=false]
+        * @returns {void}
+        */
+       api._handleSettingValidities = function handleSettingValidities( args ) {
+               var invalidSettingControls, invalidSettings = [], wasFocused = false;
+
+               // Find the controls that correspond to each invalid setting.
+               _.each( args.settingValidities, function( validity, settingId ) {
+                       var setting = api( settingId );
+                       if ( setting ) {
+
+                               // Add notifications for invalidities.
+                               if ( _.isObject( validity ) ) {
+                                       _.each( validity, function( params, code ) {
+                                               var notification, existingNotification, needsReplacement = false;
+                                               notification = new api.Notification( code, _.extend( { fromServer: true }, params ) );
+
+                                               // Remove existing notification if already exists for code but differs in parameters.
+                                               existingNotification = setting.notifications( notification.code );
+                                               if ( existingNotification ) {
+                                                       needsReplacement = notification.type !== existingNotification.type || notification.message !== existingNotification.message || ! _.isEqual( notification.data, existingNotification.data );
+                                               }
+                                               if ( needsReplacement ) {
+                                                       setting.notifications.remove( code );
+                                               }
+
+                                               if ( ! setting.notifications.has( notification.code ) ) {
+                                                       setting.notifications.add( code, notification );
+                                               }
+                                               invalidSettings.push( setting.id );
+                                       } );
+                               }
+
+                               // Remove notification errors that are no longer valid.
+                               setting.notifications.each( function( notification ) {
+                                       if ( 'error' === notification.type && ( true === validity || ! validity[ notification.code ] ) ) {
+                                               setting.notifications.remove( notification.code );
+                                       }
+                               } );
+                       }
+               } );
+
+               if ( args.focusInvalidControl ) {
+                       invalidSettingControls = api.findControlsForSettings( invalidSettings );
+
+                       // Focus on the first control that is inside of an expanded section (one that is visible).
+                       _( _.values( invalidSettingControls ) ).find( function( controls ) {
+                               return _( controls ).find( function( control ) {
+                                       var isExpanded = control.section() && api.section.has( control.section() ) && api.section( control.section() ).expanded();
+                                       if ( isExpanded && control.expanded ) {
+                                               isExpanded = control.expanded();
+                                       }
+                                       if ( isExpanded ) {
+                                               control.focus();
+                                               wasFocused = true;
+                                       }
+                                       return wasFocused;
+                               } );
+                       } );
+
+                       // Focus on the first invalid control.
+                       if ( ! wasFocused && ! _.isEmpty( invalidSettingControls ) ) {
+                               _.values( invalidSettingControls )[0][0].focus();
+                       }
+               }
+       };
+
+       /**
+        * Find all controls associated with the given settings.
+        *
+        * @since 4.6.0
+        * @param {string[]} settingIds Setting IDs.
+        * @returns {object<string, wp.customize.Control>} Mapping setting ids to arrays of controls.
+        */
+       api.findControlsForSettings = function findControlsForSettings( settingIds ) {
+               var controls = {}, settingControls;
+               _.each( _.unique( settingIds ), function( settingId ) {
+                       var setting = api( settingId );
+                       if ( setting ) {
+                               settingControls = setting.findControls();
+                               if ( settingControls && settingControls.length > 0 ) {
+                                       controls[ settingId ] = settingControls;
+                               }
+                       }
+               } );
+               return controls;
        };
 
+       /**
+        * Sort panels, sections, controls by priorities. Hide empty sections and panels.
+        *
+        * @since 4.1.0
+        */
+       api.reflowPaneContents = _.bind( function () {
+
+               var appendContainer, activeElement, rootHeadContainers, rootNodes = [], wasReflowed = false;
+
+               if ( document.activeElement ) {
+                       activeElement = $( document.activeElement );
+               }
+
+               // Sort the sections within each panel
+               api.panel.each( function ( panel ) {
+                       var sections = panel.sections(),
+                               sectionHeadContainers = _.pluck( sections, 'headContainer' );
+                       rootNodes.push( panel );
+                       appendContainer = ( panel.contentContainer.is( 'ul' ) ) ? panel.contentContainer : panel.contentContainer.find( 'ul:first' );
+                       if ( ! api.utils.areElementListsEqual( sectionHeadContainers, appendContainer.children( '[id]' ) ) ) {
+                               _( sections ).each( function ( section ) {
+                                       appendContainer.append( section.headContainer );
+                               } );
+                               wasReflowed = true;
+                       }
+               } );
+
+               // Sort the controls within each section
+               api.section.each( function ( section ) {
+                       var controls = section.controls(),
+                               controlContainers = _.pluck( controls, 'container' );
+                       if ( ! section.panel() ) {
+                               rootNodes.push( section );
+                       }
+                       appendContainer = ( section.contentContainer.is( 'ul' ) ) ? section.contentContainer : section.contentContainer.find( 'ul:first' );
+                       if ( ! api.utils.areElementListsEqual( controlContainers, appendContainer.children( '[id]' ) ) ) {
+                               _( controls ).each( function ( control ) {
+                                       appendContainer.append( control.container );
+                               } );
+                               wasReflowed = true;
+                       }
+               } );
+
+               // Sort the root panels and sections
+               rootNodes.sort( api.utils.prioritySort );
+               rootHeadContainers = _.pluck( rootNodes, 'headContainer' );
+               appendContainer = $( '#customize-theme-controls .customize-pane-parent' ); // @todo This should be defined elsewhere, and to be configurable
+               if ( ! api.utils.areElementListsEqual( rootHeadContainers, appendContainer.children() ) ) {
+                       _( rootNodes ).each( function ( rootNode ) {
+                               appendContainer.append( rootNode.headContainer );
+                       } );
+                       wasReflowed = true;
+               }
+
+               // Now re-trigger the active Value callbacks to that the panels and sections can decide whether they can be rendered
+               api.panel.each( function ( panel ) {
+                       var value = panel.active();
+                       panel.active.callbacks.fireWith( panel.active, [ value, value ] );
+               } );
+               api.section.each( function ( section ) {
+                       var value = section.active();
+                       section.active.callbacks.fireWith( section.active, [ value, value ] );
+               } );
+
+               // Restore focus if there was a reflow and there was an active (focused) element
+               if ( wasReflowed && activeElement ) {
+                       activeElement.focus();
+               }
+               api.trigger( 'pane-contents-reflowed' );
+       }, api );
+
        $( function() {
                api.settings = window._wpCustomizeSettings;
                api.l10n = window._wpCustomizeControlsL10n;
 
-               // Check if we can run the customizer.
-               if ( ! api.settings )
+               // Check if we can run the Customizer.
+               if ( ! api.settings ) {
+                       return;
+               }
+
+               // Bail if any incompatibilities are found.
+               if ( ! $.support.postMessage || ( ! $.support.cors && api.settings.isCrossDomain ) ) {
                        return;
+               }
 
-               // Redirect to the fallback preview if any incompatibilities are found.
-               if ( ! $.support.postMessage || ( ! $.support.cors && api.settings.isCrossDomain ) )
-                       return window.location = api.settings.url.fallback;
+               if ( null === api.PreviewFrame.prototype.sensitivity ) {
+                       api.PreviewFrame.prototype.sensitivity = api.settings.timeouts.previewFrameSensitivity;
+               }
+               if ( null === api.Previewer.prototype.refreshBuffer ) {
+                       api.Previewer.prototype.refreshBuffer = api.settings.timeouts.windowRefresh;
+               }
 
-               var previewer, parent, topFocus,
+               var parent,
                        body = $( document.body ),
-                       overlay = body.children('.wp-full-overlay');
+                       overlay = body.children( '.wp-full-overlay' ),
+                       title = $( '#customize-info .panel-title.site-title' ),
+                       closeBtn = $( '.customize-controls-close' ),
+                       saveBtn = $( '#save' ),
+                       footerActions = $( '#customize-footer-actions' );
 
-               // Prevent the form from saving when enter is pressed.
+               // Prevent the form from saving when enter is pressed on an input or select element.
                $('#customize-controls').on( 'keydown', function( e ) {
-                       if ( $( e.target ).is('textarea') )
-                               return;
+                       var isEnter = ( 13 === e.which ),
+                               $el = $( e.target );
 
-                       if ( 13 === e.which ) // Enter
+                       if ( isEnter && ( $el.is( 'input:not([type=button])' ) || $el.is( 'select' ) ) ) {
                                e.preventDefault();
+                       }
+               });
+
+               // Expand/Collapse the main customizer customize info.
+               $( '.customize-info' ).find( '> .accordion-section-title .customize-help-toggle' ).on( 'click', function() {
+                       var section = $( this ).closest( '.accordion-section' ),
+                               content = section.find( '.customize-panel-description:first' );
+
+                       if ( section.hasClass( 'cannot-expand' ) ) {
+                               return;
+                       }
+
+                       if ( section.hasClass( 'open' ) ) {
+                               section.toggleClass( 'open' );
+                               content.slideUp( api.Panel.prototype.defaultExpandedArguments.duration );
+                               $( this ).attr( 'aria-expanded', false );
+                       } else {
+                               content.slideDown( api.Panel.prototype.defaultExpandedArguments.duration );
+                               section.toggleClass( 'open' );
+                               $( this ).attr( 'aria-expanded', true );
+                       }
                });
 
                // Initialize Previewer
-               previewer = new api.Previewer({
+               api.previewer = new api.Previewer({
                        container:   '#customize-preview',
                        form:        '#customize-controls',
                        previewUrl:  api.settings.url.preview,
-                       allowedUrls: api.settings.url.allowed,
-                       signature:   'WP_CUSTOMIZER_SIGNATURE'
+                       allowedUrls: api.settings.url.allowed
                }, {
 
-                       nonce: api.settings.nonce,
+                       nonce: api.settings.nonce,
+
+                       /**
+                        * Build the query to send along with the Preview request.
+                        *
+                        * @since 3.4.0
+                        * @since 4.7.0 Added options param.
+                        * @access public
+                        *
+                        * @param {object}  [options] Options.
+                        * @param {boolean} [options.excludeCustomizedSaved=false] Exclude saved settings in customized response (values pending writing to changeset).
+                        * @return {object} Query vars.
+                        */
+                       query: function( options ) {
+                               var queryVars = {
+                                       wp_customize: 'on',
+                                       customize_theme: api.settings.theme.stylesheet,
+                                       nonce: this.nonce.preview,
+                                       customize_changeset_uuid: api.settings.changeset.uuid
+                               };
+
+                               /*
+                                * Exclude customized data if requested especially for calls to requestChangesetUpdate.
+                                * Changeset updates are differential and so it is a performance waste to send all of
+                                * the dirty settings with each update.
+                                */
+                               queryVars.customized = JSON.stringify( api.dirtyValues( {
+                                       unsaved: options && options.excludeCustomizedSaved
+                               } ) );
+
+                               return queryVars;
+                       },
+
+                       /**
+                        * Save (and publish) the customizer changeset.
+                        *
+                        * Updates to the changeset are transactional. If any of the settings
+                        * are invalid then none of them will be written into the changeset.
+                        * A revision will be made for the changeset post if revisions support
+                        * has been added to the post type.
+                        *
+                        * @since 3.4.0
+                        * @since 4.7.0 Added args param and return value.
+                        *
+                        * @param {object} [args] Args.
+                        * @param {string} [args.status=publish] Status.
+                        * @param {string} [args.date] Date, in local time in MySQL format.
+                        * @param {string} [args.title] Title
+                        * @returns {jQuery.promise} Promise.
+                        */
+                       save: function( args ) {
+                               var previewer = this,
+                                       deferred = $.Deferred(),
+                                       changesetStatus = 'publish',
+                                       processing = api.state( 'processing' ),
+                                       submitWhenDoneProcessing,
+                                       submit,
+                                       modifiedWhileSaving = {},
+                                       invalidSettings = [],
+                                       invalidControls;
+
+                               if ( args && args.status ) {
+                                       changesetStatus = args.status;
+                               }
+
+                               if ( api.state( 'saving' ).get() ) {
+                                       deferred.reject( 'already_saving' );
+                                       deferred.promise();
+                               }
+
+                               api.state( 'saving' ).set( true );
+
+                               function captureSettingModifiedDuringSave( setting ) {
+                                       modifiedWhileSaving[ setting.id ] = true;
+                               }
+                               api.bind( 'change', captureSettingModifiedDuringSave );
+
+                               submit = function () {
+                                       var request, query, settingInvalidities = {}, latestRevision = api._latestRevision;
+
+                                       /*
+                                        * Block saving if there are any settings that are marked as
+                                        * invalid from the client (not from the server). Focus on
+                                        * the control.
+                                        */
+                                       api.each( function( setting ) {
+                                               setting.notifications.each( function( notification ) {
+                                                       if ( 'error' === notification.type && ! notification.fromServer ) {
+                                                               invalidSettings.push( setting.id );
+                                                               if ( ! settingInvalidities[ setting.id ] ) {
+                                                                       settingInvalidities[ setting.id ] = {};
+                                                               }
+                                                               settingInvalidities[ setting.id ][ notification.code ] = notification;
+                                                       }
+                                               } );
+                                       } );
+                                       invalidControls = api.findControlsForSettings( invalidSettings );
+                                       if ( ! _.isEmpty( invalidControls ) ) {
+                                               _.values( invalidControls )[0][0].focus();
+                                               api.unbind( 'change', captureSettingModifiedDuringSave );
+                                               deferred.rejectWith( previewer, [
+                                                       { setting_invalidities: settingInvalidities }
+                                               ] );
+                                               api.state( 'saving' ).set( false );
+                                               return deferred.promise();
+                                       }
+
+                                       /*
+                                        * Note that excludeCustomizedSaved is intentionally false so that the entire
+                                        * set of customized data will be included if bypassed changeset update.
+                                        */
+                                       query = $.extend( previewer.query( { excludeCustomizedSaved: false } ), {
+                                               nonce: previewer.nonce.save,
+                                               customize_changeset_status: changesetStatus
+                                       } );
+                                       if ( args && args.date ) {
+                                               query.customize_changeset_date = args.date;
+                                       }
+                                       if ( args && args.title ) {
+                                               query.customize_changeset_title = args.title;
+                                       }
 
-                       query: function() {
-                               return {
-                                       wp_customize: 'on',
-                                       theme:      api.settings.theme.stylesheet,
-                                       customized: JSON.stringify( api.get() ),
-                                       nonce:      this.nonce.preview
-                               };
-                       },
+                                       /*
+                                        * Note that the dirty customized values will have already been set in the
+                                        * changeset and so technically query.customized could be deleted. However,
+                                        * it is remaining here to make sure that any settings that got updated
+                                        * quietly which may have not triggered an update request will also get
+                                        * included in the values that get saved to the changeset. This will ensure
+                                        * that values that get injected via the saved event will be included in
+                                        * the changeset. This also ensures that setting values that were invalid
+                                        * will get re-validated, perhaps in the case of settings that are invalid
+                                        * due to dependencies on other settings.
+                                        */
+                                       request = wp.ajax.post( 'customize_save', query );
+
+                                       // Disable save button during the save request.
+                                       saveBtn.prop( 'disabled', true );
+
+                                       api.trigger( 'save', request );
+
+                                       request.always( function () {
+                                               api.state( 'saving' ).set( false );
+                                               saveBtn.prop( 'disabled', false );
+                                               api.unbind( 'change', captureSettingModifiedDuringSave );
+                                       } );
+
+                                       request.fail( function ( response ) {
+
+                                               if ( '0' === response ) {
+                                                       response = 'not_logged_in';
+                                               } else if ( '-1' === response ) {
+                                                       // Back-compat in case any other check_ajax_referer() call is dying
+                                                       response = 'invalid_nonce';
+                                               }
 
-                       save: function() {
-                               var self  = this,
-                                       query = $.extend( this.query(), {
-                                               action: 'customize_save',
-                                               nonce:  this.nonce.save
-                                       }),
-                                       request = $.post( api.settings.url.ajax, query );
+                                               if ( 'invalid_nonce' === response ) {
+                                                       previewer.cheatin();
+                                               } else if ( 'not_logged_in' === response ) {
+                                                       previewer.preview.iframe.hide();
+                                                       previewer.login().done( function() {
+                                                               previewer.save();
+                                                               previewer.preview.iframe.show();
+                                                       } );
+                                               }
 
-                               api.trigger( 'save', request );
+                                               if ( response.setting_validities ) {
+                                                       api._handleSettingValidities( {
+                                                               settingValidities: response.setting_validities,
+                                                               focusInvalidControl: true
+                                                       } );
+                                               }
 
-                               body.addClass('saving');
+                                               deferred.rejectWith( previewer, [ response ] );
+                                               api.trigger( 'error', response );
+                                       } );
+
+                                       request.done( function( response ) {
+
+                                               previewer.send( 'saved', response );
+
+                                               api.state( 'changesetStatus' ).set( response.changeset_status );
+                                               if ( 'publish' === response.changeset_status ) {
+
+                                                       // Mark all published as clean if they haven't been modified during the request.
+                                                       api.each( function( setting ) {
+                                                               /*
+                                                                * Note that the setting revision will be undefined in the case of setting
+                                                                * values that are marked as dirty when the customizer is loaded, such as
+                                                                * when applying starter content. All other dirty settings will have an
+                                                                * associated revision due to their modification triggering a change event.
+                                                                */
+                                                               if ( setting._dirty && ( _.isUndefined( api._latestSettingRevisions[ setting.id ] ) || api._latestSettingRevisions[ setting.id ] <= latestRevision ) ) {
+                                                                       setting._dirty = false;
+                                                               }
+                                                       } );
+
+                                                       api.state( 'changesetStatus' ).set( '' );
+                                                       api.settings.changeset.uuid = response.next_changeset_uuid;
+                                                       parent.send( 'changeset-uuid', api.settings.changeset.uuid );
+                                               }
 
-                               request.always( function() {
-                                       body.removeClass('saving');
-                               });
+                                               if ( response.setting_validities ) {
+                                                       api._handleSettingValidities( {
+                                                               settingValidities: response.setting_validities,
+                                                               focusInvalidControl: true
+                                                       } );
+                                               }
 
-                               request.done( function( response ) {
-                                       // Check if the user is logged out.
-                                       if ( '0' === response ) {
-                                               self.preview.iframe.hide();
-                                               self.login().done( function() {
-                                                       self.save();
-                                                       self.preview.iframe.show();
-                                               });
-                                               return;
-                                       }
+                                               deferred.resolveWith( previewer, [ response ] );
+                                               api.trigger( 'saved', response );
 
-                                       // Check for cheaters.
-                                       if ( '-1' === response ) {
-                                               self.cheatin();
-                                               return;
-                                       }
+                                               // Restore the global dirty state if any settings were modified during save.
+                                               if ( ! _.isEmpty( modifiedWhileSaving ) ) {
+                                                       api.state( 'saved' ).set( false );
+                                               }
+                                       } );
+                               };
 
-                                       api.trigger( 'saved' );
-                               });
+                               if ( 0 === processing() ) {
+                                       submit();
+                               } else {
+                                       submitWhenDoneProcessing = function () {
+                                               if ( 0 === processing() ) {
+                                                       api.state.unbind( 'change', submitWhenDoneProcessing );
+                                                       submit();
+                                               }
+                                       };
+                                       api.state.bind( 'change', submitWhenDoneProcessing );
+                               }
+
+                               return deferred.promise();
                        }
                });
 
                // 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 );
                });
 
+               // Refresh the nonces if login sends updated nonces over.
+               api.bind( 'nonce-refresh', function( nonce ) {
+                       $.extend( api.settings.nonce, nonce );
+                       $.extend( api.previewer.nonce, nonce );
+                       api.previewer.send( 'nonce-refresh', nonce );
+               });
+
+               // Create Settings
                $.each( api.settings.settings, function( id, data ) {
-                       api.create( id, id, data.value, {
+                       var constructor = api.settingConstructor[ data.type ] || api.Setting,
+                               setting;
+
+                       setting = new constructor( id, data.value, {
                                transport: data.transport,
-                               previewer: previewer
+                               previewer: api.previewer,
+                               dirty: !! data.dirty
+                       } );
+                       api.add( id, setting );
+               });
+
+               // Create Panels
+               $.each( api.settings.panels, function ( id, data ) {
+                       var constructor = api.panelConstructor[ data.type ] || api.Panel,
+                               panel;
+
+                       panel = new constructor( id, {
+                               params: data
+                       } );
+                       api.panel.add( id, panel );
+               });
+
+               // Create Sections
+               $.each( api.settings.sections, function ( id, data ) {
+                       var constructor = api.sectionConstructor[ data.type ] || api.Section,
+                               section;
+
+                       section = new constructor( id, {
+                               params: data
                        } );
+                       api.section.add( id, section );
                });
 
+               // Create Controls
                $.each( api.settings.controls, function( id, data ) {
                        var constructor = api.controlConstructor[ data.type ] || api.Control,
                                control;
 
-                       control = api.control.add( id, new constructor( id, {
+                       control = new constructor( id, {
                                params: data,
-                               previewer: previewer
-                       } ) );
+                               previewer: api.previewer
+                       } );
+                       api.control.add( id, control );
                });
 
-               // Check if preview url is valid and load the preview frame.
-               if ( previewer.previewUrl() )
-                       previewer.refresh();
-               else
-                       previewer.previewUrl( api.settings.url.home );
+               // Focus the autofocused element
+               _.each( [ 'panel', 'section', 'control' ], function( type ) {
+                       var id = api.settings.autofocus[ type ];
+                       if ( ! id ) {
+                               return;
+                       }
+
+                       /*
+                        * Defer focus until:
+                        * 1. The panel, section, or control exists (especially for dynamically-created ones).
+                        * 2. The instance is embedded in the document (and so is focusable).
+                        * 3. The preview has finished loading so that the active states have been set.
+                        */
+                       api[ type ]( id, function( instance ) {
+                               instance.deferred.embedded.done( function() {
+                                       api.previewer.deferred.active.done( function() {
+                                               instance.focus();
+                                       });
+                               });
+                       });
+               });
+
+               api.bind( 'ready', api.reflowPaneContents );
+               $( [ api.panel, api.section, api.control ] ).each( function ( i, values ) {
+                       var debouncedReflowPaneContents = _.debounce( api.reflowPaneContents, api.settings.timeouts.reflowPaneContents );
+                       values.bind( 'add', debouncedReflowPaneContents );
+                       values.bind( 'change', debouncedReflowPaneContents );
+                       values.bind( 'remove', debouncedReflowPaneContents );
+               } );
 
                // Save and activated states
                (function() {
                        var state = new api.Values(),
-                               saved = state.create('saved'),
-                               activated = state.create('activated');
+                               saved = state.create( 'saved' ),
+                               saving = state.create( 'saving' ),
+                               activated = state.create( 'activated' ),
+                               processing = state.create( 'processing' ),
+                               paneVisible = state.create( 'paneVisible' ),
+                               expandedPanel = state.create( 'expandedPanel' ),
+                               expandedSection = state.create( 'expandedSection' ),
+                               changesetStatus = state.create( 'changesetStatus' ),
+                               previewerAlive = state.create( 'previewerAlive' ),
+                               editShortcutVisibility  = state.create( 'editShortcutVisibility' ),
+                               populateChangesetUuidParam;
 
                        state.bind( 'change', function() {
-                               var save = $('#save'),
-                                       back = $('.back');
+                               var canSave;
 
                                if ( ! activated() ) {
-                                       save.val( api.l10n.activate ).prop( 'disabled', false );
-                                       back.text( api.l10n.cancel );
+                                       saveBtn.val( api.l10n.activate );
+                                       closeBtn.find( '.screen-reader-text' ).text( api.l10n.cancel );
 
-                               } else if ( saved() ) {
-                                       save.val( api.l10n.saved ).prop( 'disabled', true );
-                                       back.text( api.l10n.close );
+                               } else if ( '' === changesetStatus.get() && saved() ) {
+                                       saveBtn.val( api.l10n.saved );
+                                       closeBtn.find( '.screen-reader-text' ).text( api.l10n.close );
 
                                } else {
-                                       save.val( api.l10n.save ).prop( 'disabled', false );
-                                       back.text( api.l10n.cancel );
+                                       saveBtn.val( api.l10n.save );
+                                       closeBtn.find( '.screen-reader-text' ).text( api.l10n.cancel );
                                }
+
+                               /*
+                                * Save (publish) button should be enabled if saving is not currently happening,
+                                * and if the theme is not active or the changeset exists but is not published.
+                                */
+                               canSave = ! saving() && ( ! activated() || ! saved() || ( '' !== changesetStatus() && 'publish' !== changesetStatus() ) );
+
+                               saveBtn.prop( 'disabled', ! canSave );
                        });
 
                        // Set default states.
+                       changesetStatus( api.settings.changeset.status );
                        saved( true );
+                       if ( '' === changesetStatus() ) { // Handle case for loading starter content.
+                               api.each( function( setting ) {
+                                       if ( setting._dirty ) {
+                                               saved( false );
+                                       }
+                               } );
+                       }
+                       saving( false );
                        activated( api.settings.theme.active );
+                       processing( 0 );
+                       paneVisible( true );
+                       expandedPanel( false );
+                       expandedSection( false );
+                       previewerAlive( true );
+                       editShortcutVisibility( 'visible' );
 
                        api.bind( 'change', function() {
                                state('saved').set( false );
                        });
 
-                       api.bind( 'saved', function() {
+                       saving.bind( function( isSaving ) {
+                               body.toggleClass( 'saving', isSaving );
+                       } );
+
+                       api.bind( 'saved', function( response ) {
                                state('saved').set( true );
-                               state('activated').set( true );
+                               if ( 'publish' === response.changeset_status ) {
+                                       state( 'activated' ).set( true );
+                               }
                        });
 
                        activated.bind( function( to ) {
-                               if ( to )
+                               if ( to ) {
                                        api.trigger( 'activated' );
+                               }
                        });
 
+                       /**
+                        * Populate URL with UUID via `history.replaceState()`.
+                        *
+                        * @since 4.7.0
+                        * @access private
+                        *
+                        * @param {boolean} isIncluded Is UUID included.
+                        * @returns {void}
+                        */
+                       populateChangesetUuidParam = function( isIncluded ) {
+                               var urlParser, queryParams;
+                               urlParser = document.createElement( 'a' );
+                               urlParser.href = location.href;
+                               queryParams = api.utils.parseQueryString( urlParser.search.substr( 1 ) );
+                               if ( isIncluded ) {
+                                       if ( queryParams.changeset_uuid === api.settings.changeset.uuid ) {
+                                               return;
+                                       }
+                                       queryParams.changeset_uuid = api.settings.changeset.uuid;
+                               } else {
+                                       if ( ! queryParams.changeset_uuid ) {
+                                               return;
+                                       }
+                                       delete queryParams.changeset_uuid;
+                               }
+                               urlParser.search = $.param( queryParams );
+                               history.replaceState( {}, document.title, urlParser.href );
+                       };
+
+                       if ( history.replaceState ) {
+                               changesetStatus.bind( function( newStatus ) {
+                                       populateChangesetUuidParam( '' !== newStatus && 'publish' !== newStatus );
+                               } );
+                       }
+
                        // Expose states to the API.
                        api.state = state;
                }());
 
+               // Check if preview url is valid and load the preview frame.
+               if ( api.previewer.previewUrl() ) {
+                       api.previewer.refresh();
+               } else {
+                       api.previewer.previewUrl( api.settings.url.home );
+               }
+
                // Button bindings.
-               $('#save').click( function( event ) {
-                       previewer.save();
+               saveBtn.click( function( event ) {
+                       api.previewer.save();
                        event.preventDefault();
                }).keydown( function( event ) {
                        if ( 9 === event.which ) // tab
                                return;
                        if ( 13 === event.which ) // enter
-                               previewer.save();
+                               api.previewer.save();
                        event.preventDefault();
                });
 
-               $('.back').keydown( function( event ) {
+               closeBtn.keydown( function( event ) {
                        if ( 9 === event.which ) // tab
                                return;
                        if ( 13 === event.which ) // enter
                        event.preventDefault();
                });
 
-               $('.upload-dropzone a.upload').keydown( function( event ) {
-                       if ( 13 === event.which ) // enter
-                               this.click();
+               $( '.collapse-sidebar' ).on( 'click', function() {
+                       api.state( 'paneVisible' ).set( ! api.state( 'paneVisible' ).get() );
+               });
+
+               api.state( 'paneVisible' ).bind( function( paneVisible ) {
+                       overlay.toggleClass( 'preview-only', ! paneVisible );
+                       overlay.toggleClass( 'expanded', paneVisible );
+                       overlay.toggleClass( 'collapsed', ! paneVisible );
+
+                       if ( ! paneVisible ) {
+                               $( '.collapse-sidebar' ).attr({ 'aria-expanded': 'false', 'aria-label': api.l10n.expandSidebar });
+                       } else {
+                               $( '.collapse-sidebar' ).attr({ 'aria-expanded': 'true', 'aria-label': api.l10n.collapseSidebar });
+                       }
                });
 
-               $('.collapse-sidebar').on( 'click keydown', function( event ) {
-                       if ( event.type === 'keydown' &&  13 !== event.which ) // enter
+               // Keyboard shortcuts - esc to exit section/panel.
+               $( 'body' ).on( 'keydown', function( event ) {
+                       var collapsedObject, expandedControls = [], expandedSections = [], expandedPanels = [];
+
+                       if ( 27 !== event.which ) { // Esc.
                                return;
+                       }
 
-                       overlay.toggleClass( 'collapsed' ).toggleClass( 'expanded' );
-                       event.preventDefault();
+                       /*
+                        * Abort if the event target is not the body (the default) and not inside of #customize-controls.
+                        * This ensures that ESC meant to collapse a modal dialog or a TinyMCE toolbar won't collapse something else.
+                        */
+                       if ( ! $( event.target ).is( 'body' ) && ! $.contains( $( '#customize-controls' )[0], event.target ) ) {
+                               return;
+                       }
+
+                       // Check for expanded expandable controls (e.g. widgets and nav menus items), sections, and panels.
+                       api.control.each( function( control ) {
+                               if ( control.expanded && control.expanded() && _.isFunction( control.collapse ) ) {
+                                       expandedControls.push( control );
+                               }
+                       });
+                       api.section.each( function( section ) {
+                               if ( section.expanded() ) {
+                                       expandedSections.push( section );
+                               }
+                       });
+                       api.panel.each( function( panel ) {
+                               if ( panel.expanded() ) {
+                                       expandedPanels.push( panel );
+                               }
+                       });
+
+                       // Skip collapsing expanded controls if there are no expanded sections.
+                       if ( expandedControls.length > 0 && 0 === expandedSections.length ) {
+                               expandedControls.length = 0;
+                       }
+
+                       // Collapse the most granular expanded object.
+                       collapsedObject = expandedControls[0] || expandedSections[0] || expandedPanels[0];
+                       if ( collapsedObject ) {
+                               collapsedObject.collapse();
+                               event.preventDefault();
+                       }
+               });
+
+               $( '.customize-controls-preview-toggle' ).on( 'click', function() {
+                       api.state( 'paneVisible' ).set( ! api.state( 'paneVisible' ).get() );
+               });
+
+               /*
+                * Sticky header feature.
+                */
+               (function initStickyHeaders() {
+                       var parentContainer = $( '.wp-full-overlay-sidebar-content' ),
+                               changeContainer, getHeaderHeight, releaseStickyHeader, resetStickyHeader, positionStickyHeader,
+                               activeHeader, lastScrollTop;
+
+                       /**
+                        * Determine which panel or section is currently expanded.
+                        *
+                        * @since 4.7.0
+                        * @access private
+                        *
+                        * @param {wp.customize.Panel|wp.customize.Section} container Construct.
+                        * @returns {void}
+                        */
+                       changeContainer = function( container ) {
+                               var newInstance = container,
+                                       expandedSection = api.state( 'expandedSection' ).get(),
+                                       expandedPanel = api.state( 'expandedPanel' ).get(),
+                                       headerElement;
+
+                               // Release previously active header element.
+                               if ( activeHeader && activeHeader.element ) {
+                                       releaseStickyHeader( activeHeader.element );
+                               }
+
+                               if ( ! newInstance ) {
+                                       if ( ! expandedSection && expandedPanel && expandedPanel.contentContainer ) {
+                                               newInstance = expandedPanel;
+                                       } else if ( ! expandedPanel && expandedSection && expandedSection.contentContainer ) {
+                                               newInstance = expandedSection;
+                                       } else {
+                                               activeHeader = false;
+                                               return;
+                                       }
+                               }
+
+                               headerElement = newInstance.contentContainer.find( '.customize-section-title, .panel-meta' ).first();
+                               if ( headerElement.length ) {
+                                       activeHeader = {
+                                               instance: newInstance,
+                                               element:  headerElement,
+                                               parent:   headerElement.closest( '.customize-pane-child' ),
+                                               height:   getHeaderHeight( headerElement )
+                                       };
+                                       if ( expandedSection ) {
+                                               resetStickyHeader( activeHeader.element, activeHeader.parent );
+                                       }
+                               } else {
+                                       activeHeader = false;
+                               }
+                       };
+                       api.state( 'expandedSection' ).bind( changeContainer );
+                       api.state( 'expandedPanel' ).bind( changeContainer );
+
+                       // Throttled scroll event handler.
+                       parentContainer.on( 'scroll', _.throttle( function() {
+                               if ( ! activeHeader ) {
+                                       return;
+                               }
+
+                               var scrollTop = parentContainer.scrollTop(),
+                                       isScrollingUp = ( lastScrollTop ) ? scrollTop <= lastScrollTop : true;
+
+                               lastScrollTop = scrollTop;
+                               positionStickyHeader( activeHeader, scrollTop, isScrollingUp );
+                       }, 8 ) );
+
+                       // Release header element if it is sticky.
+                       releaseStickyHeader = function( headerElement ) {
+                               if ( ! headerElement.hasClass( 'is-sticky' ) ) {
+                                       return;
+                               }
+                               headerElement
+                                       .removeClass( 'is-sticky' )
+                                       .addClass( 'maybe-sticky is-in-view' )
+                                       .css( 'top', parentContainer.scrollTop() + 'px' );
+                       };
+
+                       // Reset position of the sticky header.
+                       resetStickyHeader = function( headerElement, headerParent ) {
+                               headerElement
+                                       .removeClass( 'maybe-sticky is-in-view' )
+                                       .css( {
+                                               width: '',
+                                               top: ''
+                                       } );
+                               headerParent.css( 'padding-top', '' );
+                       };
+
+                       /**
+                        * Get header height.
+                        *
+                        * @since 4.7.0
+                        * @access private
+                        *
+                        * @param {jQuery} headerElement Header element.
+                        * @returns {number} Height.
+                        */
+                       getHeaderHeight = function( headerElement ) {
+                               var height = headerElement.data( 'height' );
+                               if ( ! height ) {
+                                       height = headerElement.outerHeight();
+                                       headerElement.data( 'height', height );
+                               }
+                               return height;
+                       };
+
+                       /**
+                        * Reposition header on throttled `scroll` event.
+                        *
+                        * @since 4.7.0
+                        * @access private
+                        *
+                        * @param {object}  header        Header.
+                        * @param {number}  scrollTop     Scroll top.
+                        * @param {boolean} isScrollingUp Is scrolling up?
+                        * @returns {void}
+                        */
+                       positionStickyHeader = function( header, scrollTop, isScrollingUp ) {
+                               var headerElement = header.element,
+                                       headerParent = header.parent,
+                                       headerHeight = header.height,
+                                       headerTop = parseInt( headerElement.css( 'top' ), 10 ),
+                                       maybeSticky = headerElement.hasClass( 'maybe-sticky' ),
+                                       isSticky = headerElement.hasClass( 'is-sticky' ),
+                                       isInView = headerElement.hasClass( 'is-in-view' );
+
+                               // When scrolling down, gradually hide sticky header.
+                               if ( ! isScrollingUp ) {
+                                       if ( isSticky ) {
+                                               headerTop = scrollTop;
+                                               headerElement
+                                                       .removeClass( 'is-sticky' )
+                                                       .css( {
+                                                               top:   headerTop + 'px',
+                                                               width: ''
+                                                       } );
+                                       }
+                                       if ( isInView && scrollTop > headerTop + headerHeight ) {
+                                               headerElement.removeClass( 'is-in-view' );
+                                               headerParent.css( 'padding-top', '' );
+                                       }
+                                       return;
+                               }
+
+                               // Scrolling up.
+                               if ( ! maybeSticky && scrollTop >= headerHeight ) {
+                                       maybeSticky = true;
+                                       headerElement.addClass( 'maybe-sticky' );
+                               } else if ( 0 === scrollTop ) {
+                                       // Reset header in base position.
+                                       headerElement
+                                               .removeClass( 'maybe-sticky is-in-view is-sticky' )
+                                               .css( {
+                                                       top:   '',
+                                                       width: ''
+                                               } );
+                                       headerParent.css( 'padding-top', '' );
+                                       return;
+                               }
+
+                               if ( isInView && ! isSticky ) {
+                                       // Header is in the view but is not yet sticky.
+                                       if ( headerTop >= scrollTop ) {
+                                               // Header is fully visible.
+                                               headerElement
+                                                       .addClass( 'is-sticky' )
+                                                       .css( {
+                                                               top:   '',
+                                                               width: headerParent.outerWidth() + 'px'
+                                                       } );
+                                       }
+                               } else if ( maybeSticky && ! isInView ) {
+                                       // Header is out of the view.
+                                       headerElement
+                                               .addClass( 'is-in-view' )
+                                               .css( 'top', ( scrollTop - headerHeight ) + 'px' );
+                                       headerParent.css( 'padding-top', headerHeight + 'px' );
+                               }
+                       };
+               }());
+
+               // Previewed device bindings.
+               api.previewedDevice = new api.Value();
+
+               // Set the default device.
+               api.bind( 'ready', function() {
+                       _.find( api.settings.previewableDevices, function( value, key ) {
+                               if ( true === value['default'] ) {
+                                       api.previewedDevice.set( key );
+                                       return true;
+                               }
+                       } );
+               } );
+
+               // Set the toggled device.
+               footerActions.find( '.devices button' ).on( 'click', function( event ) {
+                       api.previewedDevice.set( $( event.currentTarget ).data( 'device' ) );
                });
 
-               // Create a potential postMessage connection with the parent frame.
+               // Bind device changes.
+               api.previewedDevice.bind( function( newDevice ) {
+                       var overlay = $( '.wp-full-overlay' ),
+                               devices = '';
+
+                       footerActions.find( '.devices button' )
+                               .removeClass( 'active' )
+                               .attr( 'aria-pressed', false );
+
+                       footerActions.find( '.devices .preview-' + newDevice )
+                               .addClass( 'active' )
+                               .attr( 'aria-pressed', true );
+
+                       $.each( api.settings.previewableDevices, function( device ) {
+                               devices += ' preview-' + device;
+                       } );
+
+                       overlay
+                               .removeClass( devices )
+                               .addClass( 'preview-' + newDevice );
+               } );
+
+               // Bind site title display to the corresponding field.
+               if ( title.length ) {
+                       api( 'blogname', function( setting ) {
+                               var updateTitle = function() {
+                                       title.text( $.trim( setting() ) || api.l10n.untitledBlogName );
+                               };
+                               setting.bind( updateTitle );
+                               updateTitle();
+                       } );
+               }
+
+               /*
+                * Create a postMessage connection with a parent frame,
+                * in case the Customizer frame was opened with the Customize loader.
+                *
+                * @see wp.customize.Loader
+                */
                parent = new api.Messenger({
                        url: api.settings.url.parent,
                        channel: 'loader'
                });
 
-               // If we receive a 'back' event, we're inside an iframe.
-               // Send any clicks to the 'Return' link to the parent page.
+               /*
+                * If we receive a 'back' event, we're inside an iframe.
+                * Send any clicks to the 'Return' link to the parent page.
+                */
                parent.bind( 'back', function() {
-                       $('.back').on( 'click.back', function( event ) {
+                       closeBtn.on( 'click.customize-controls-close', function( event ) {
                                event.preventDefault();
                                parent.send( 'close' );
                        });
                });
 
+               // Prompt user with AYS dialog if leaving the Customizer with unsaved changes
+               $( window ).on( 'beforeunload.customize-confirm', function () {
+                       if ( ! api.state( 'saved' )() ) {
+                               setTimeout( function() {
+                                       overlay.removeClass( 'customize-loading' );
+                               }, 1 );
+                               return api.l10n.saveAlert;
+                       }
+               } );
+
                // Pass events through to the parent.
-               api.bind( 'saved', function() {
-                       parent.send( 'saved' );
-               });
+               $.each( [ 'saved', 'change' ], function ( i, event ) {
+                       api.bind( event, function() {
+                               parent.send( event );
+                       });
+               } );
 
-               // When activated, let the loader handle redirecting the page.
-               // If no loader exists, redirect the page ourselves (if a url exists).
-               api.bind( 'activated', function() {
-                       if ( parent.targetWindow() )
-                               parent.send( 'activated', api.settings.url.activated );
-                       else if ( api.settings.url.activated )
-                               window.location = api.settings.url.activated;
+               // Pass titles to the parent
+               api.bind( 'title', function( newTitle ) {
+                       parent.send( 'title', newTitle );
                });
 
+               parent.send( 'changeset-uuid', api.settings.changeset.uuid );
+
                // Initialize the connection with the parent frame.
                parent.send( 'ready' );
 
                // Control visibility for default controls
                $.each({
                        'background_image': {
-                               controls: [ 'background_repeat', 'background_position_x', 'background_attachment' ],
+                               controls: [ 'background_preset', 'background_position', 'background_size', 'background_repeat', 'background_attachment' ],
                                callback: function( to ) { return !! to; }
                        },
                        'show_on_front': {
                        });
                });
 
+               api.control( 'background_preset', function( control ) {
+                       var visibility, defaultValues, values, toggleVisibility, updateSettings, preset;
+
+                       visibility = { // position, size, repeat, attachment
+                               'default': [ false, false, false, false ],
+                               'fill': [ true, false, false, false ],
+                               'fit': [ true, false, true, false ],
+                               'repeat': [ true, false, false, true ],
+                               'custom': [ true, true, true, true ]
+                       };
+
+                       defaultValues = [
+                               _wpCustomizeBackground.defaults['default-position-x'],
+                               _wpCustomizeBackground.defaults['default-position-y'],
+                               _wpCustomizeBackground.defaults['default-size'],
+                               _wpCustomizeBackground.defaults['default-repeat'],
+                               _wpCustomizeBackground.defaults['default-attachment']
+                       ];
+
+                       values = { // position_x, position_y, size, repeat, attachment
+                               'default': defaultValues,
+                               'fill': [ 'left', 'top', 'cover', 'no-repeat', 'fixed' ],
+                               'fit': [ 'left', 'top', 'contain', 'no-repeat', 'fixed' ],
+                               'repeat': [ 'left', 'top', 'auto', 'repeat', 'scroll' ]
+                       };
+
+                       // @todo These should actually toggle the active state, but without the preview overriding the state in data.activeControls.
+                       toggleVisibility = function( preset ) {
+                               _.each( [ 'background_position', 'background_size', 'background_repeat', 'background_attachment' ], function( controlId, i ) {
+                                       var control = api.control( controlId );
+                                       if ( control ) {
+                                               control.container.toggle( visibility[ preset ][ i ] );
+                                       }
+                               } );
+                       };
+
+                       updateSettings = function( preset ) {
+                               _.each( [ 'background_position_x', 'background_position_y', 'background_size', 'background_repeat', 'background_attachment' ], function( settingId, i ) {
+                                       var setting = api( settingId );
+                                       if ( setting ) {
+                                               setting.set( values[ preset ][ i ] );
+                                       }
+                               } );
+                       };
+
+                       preset = control.setting.get();
+                       toggleVisibility( preset );
+
+                       control.setting.bind( 'change', function( preset ) {
+                               toggleVisibility( preset );
+                               if ( 'custom' !== preset ) {
+                                       updateSettings( preset );
+                               }
+                       } );
+               } );
+
+               api.control( 'background_repeat', function( control ) {
+                       control.elements[0].unsync( api( 'background_repeat' ) );
+
+                       control.element = new api.Element( control.container.find( 'input' ) );
+                       control.element.set( 'no-repeat' !== control.setting() );
+
+                       control.element.bind( function( to ) {
+                               control.setting.set( to ? 'repeat' : 'no-repeat' );
+                       } );
+
+                       control.setting.bind( function( to ) {
+                               control.element.set( 'no-repeat' !== to );
+                       } );
+               } );
+
+               api.control( 'background_attachment', function( control ) {
+                       control.elements[0].unsync( api( 'background_attachment' ) );
+
+                       control.element = new api.Element( control.container.find( 'input' ) );
+                       control.element.set( 'fixed' !== control.setting() );
+
+                       control.element.bind( function( to ) {
+                               control.setting.set( to ? 'scroll' : 'fixed' );
+                       } );
+
+                       control.setting.bind( function( to ) {
+                               control.element.set( 'fixed' !== to );
+                       } );
+               } );
+
                // Juggle the two controls that use header_textcolor
                api.control( 'display_header_text', function( control ) {
                        var last = '';
                        });
                });
 
-               // Handle header image data
-               api.control( 'header_image', function( control ) {
-                       control.setting.bind( function( to ) {
-                               if ( to === control.params.removed )
-                                       control.settings.data.set( false );
-                       });
+               // Change previewed URL to the homepage when changing the page_on_front.
+               api( 'show_on_front', 'page_on_front', function( showOnFront, pageOnFront ) {
+                       var updatePreviewUrl = function() {
+                               if ( showOnFront() === 'page' && parseInt( pageOnFront(), 10 ) > 0 ) {
+                                       api.previewer.previewUrl.set( api.settings.url.home );
+                               }
+                       };
+                       showOnFront.bind( updatePreviewUrl );
+                       pageOnFront.bind( updatePreviewUrl );
+               });
 
-                       control.library.on( 'click', 'a', function() {
-                               control.settings.data.set( $(this).data('customizeHeaderImageData') );
+               // Change the previewed URL to the selected page when changing the page_for_posts.
+               api( 'page_for_posts', function( setting ) {
+                       setting.bind(function( pageId ) {
+                               pageId = parseInt( pageId, 10 );
+                               if ( pageId > 0 ) {
+                                       api.previewer.previewUrl.set( api.settings.url.home + '?page_id=' + pageId );
+                               }
                        });
+               });
+
+               // Allow tabs to be entered in Custom CSS textarea.
+               api.control( 'custom_css', function setupCustomCssControl( control ) {
+                       control.deferred.embedded.done( function allowTabs() {
+                               var $textarea = control.container.find( 'textarea' ), textarea = $textarea[0];
+
+                               $textarea.on( 'blur', function onBlur() {
+                                       $textarea.data( 'next-tab-blurs', false );
+                               } );
+
+                               $textarea.on( 'keydown', function onKeydown( event ) {
+                                       var selectionStart, selectionEnd, value, tabKeyCode = 9, escKeyCode = 27;
+
+                                       if ( escKeyCode === event.keyCode ) {
+                                               if ( ! $textarea.data( 'next-tab-blurs' ) ) {
+                                                       $textarea.data( 'next-tab-blurs', true );
+                                                       event.stopPropagation(); // Prevent collapsing the section.
+                                               }
+                                               return;
+                                       }
+
+                                       // Short-circuit if tab key is not being pressed or if a modifier key *is* being pressed.
+                                       if ( tabKeyCode !== event.keyCode || event.ctrlKey || event.altKey || event.shiftKey ) {
+                                               return;
+                                       }
+
+                                       // Prevent capturing Tab characters if Esc was pressed.
+                                       if ( $textarea.data( 'next-tab-blurs' ) ) {
+                                               return;
+                                       }
 
-                       control.uploader.success = function( attachment ) {
-                               var data;
+                                       selectionStart = textarea.selectionStart;
+                                       selectionEnd = textarea.selectionEnd;
+                                       value = textarea.value;
 
-                               api.ImageControl.prototype.success.call( control, attachment );
+                                       if ( selectionStart >= 0 ) {
+                                               textarea.value = value.substring( 0, selectionStart ).concat( '\t', value.substring( selectionEnd ) );
+                                               $textarea.selectionStart = textarea.selectionEnd = selectionStart + 1;
+                                       }
 
-                               data = {
-                                       attachment_id: attachment.get('id'),
-                                       url:           attachment.get('url'),
-                                       thumbnail_url: attachment.get('url'),
-                                       height:        attachment.get('height'),
-                                       width:         attachment.get('width')
+                                       event.stopPropagation();
+                                       event.preventDefault();
+                               } );
+                       } );
+               } );
+
+               // Toggle visibility of Header Video notice when active state change.
+               api.control( 'header_video', function( headerVideoControl ) {
+                       headerVideoControl.deferred.embedded.done( function() {
+                               var toggleNotice = function() {
+                                       var section = api.section( headerVideoControl.section() ), notice;
+                                       if ( ! section ) {
+                                               return;
+                                       }
+                                       notice = section.container.find( '.header-video-not-currently-previewable:first' );
+                                       if ( headerVideoControl.active.get() ) {
+                                               notice.stop().slideUp( 'fast' );
+                                       } else {
+                                               notice.stop().slideDown( 'fast' );
+                                       }
                                };
+                               toggleNotice();
+                               headerVideoControl.active.bind( toggleNotice );
+                       } );
+               } );
 
-                               attachment.element.data( 'customizeHeaderImageData', data );
-                               control.settings.data.set( data );
-                       };
+               // Update the setting validities.
+               api.previewer.bind( 'selective-refresh-setting-validities', function handleSelectiveRefreshedSettingValidities( settingValidities ) {
+                       api._handleSettingValidities( {
+                               settingValidities: settingValidities,
+                               focusInvalidControl: false
+                       } );
+               } );
+
+               // Focus on the control that is associated with the given setting.
+               api.previewer.bind( 'focus-control-for-setting', function( settingId ) {
+                       var matchedControls = [];
+                       api.control.each( function( control ) {
+                               var settingIds = _.pluck( control.settings, 'id' );
+                               if ( -1 !== _.indexOf( settingIds, settingId ) ) {
+                                       matchedControls.push( control );
+                               }
+                       } );
+
+                       // Focus on the matched control with the lowest priority (appearing higher).
+                       if ( matchedControls.length ) {
+                               matchedControls.sort( function( a, b ) {
+                                       return a.priority() - b.priority();
+                               } );
+                               matchedControls[0].focus();
+                       }
+               } );
+
+               // Refresh the preview when it requests.
+               api.previewer.bind( 'refresh', function() {
+                       api.previewer.refresh();
                });
 
-               api.trigger( 'ready' );
+               // Update the edit shortcut visibility state.
+               api.state( 'paneVisible' ).bind( function( isPaneVisible ) {
+                       var isMobileScreen;
+                       if ( window.matchMedia ) {
+                               isMobileScreen = window.matchMedia( 'screen and ( max-width: 640px )' ).matches;
+                       } else {
+                               isMobileScreen = $( window ).width() <= 640;
+                       }
+                       api.state( 'editShortcutVisibility' ).set( isPaneVisible || isMobileScreen ? 'visible' : 'hidden' );
+               } );
+               if ( window.matchMedia ) {
+                       window.matchMedia( 'screen and ( max-width: 640px )' ).addListener( function() {
+                               var state = api.state( 'paneVisible' );
+                               state.callbacks.fireWith( state, [ state.get(), state.get() ] );
+                       } );
+               }
+               api.previewer.bind( 'edit-shortcut-visibility', function( visibility ) {
+                       api.state( 'editShortcutVisibility' ).set( visibility );
+               } );
+               api.state( 'editShortcutVisibility' ).bind( function( visibility ) {
+                       api.previewer.send( 'edit-shortcut-visibility', visibility );
+               } );
+
+               // Autosave changeset.
+               ( function() {
+                       var timeoutId, updateChangesetWithReschedule, scheduleChangesetUpdate, updatePending = false;
+
+                       /**
+                        * Request changeset update and then re-schedule the next changeset update time.
+                        *
+                        * @since 4.7.0
+                        * @private
+                        */
+                       updateChangesetWithReschedule = function() {
+                               if ( ! updatePending ) {
+                                       updatePending = true;
+                                       api.requestChangesetUpdate().always( function() {
+                                               updatePending = false;
+                                       } );
+                               }
+                               scheduleChangesetUpdate();
+                       };
+
+                       /**
+                        * Schedule changeset update.
+                        *
+                        * @since 4.7.0
+                        * @private
+                        */
+                       scheduleChangesetUpdate = function() {
+                               clearTimeout( timeoutId );
+                               timeoutId = setTimeout( function() {
+                                       updateChangesetWithReschedule();
+                               }, api.settings.timeouts.changesetAutoSave );
+                       };
+
+                       // Start auto-save interval for updating changeset.
+                       scheduleChangesetUpdate();
 
-               // Make sure left column gets focus
-               topFocus = $('.back');
-               topFocus.focus();
-               setTimeout(function () {
-                       topFocus.focus();
-               }, 200);
+                       // Save changeset when focus removed from window.
+                       $( window ).on( 'blur.wp-customize-changeset-update', function() {
+                               updateChangesetWithReschedule();
+                       } );
+
+                       // Save changeset before unloading window.
+                       $( window ).on( 'beforeunload.wp-customize-changeset-update', function() {
+                               updateChangesetWithReschedule();
+                       } );
+               } ());
 
+               api.trigger( 'ready' );
        });
 
 })( wp, jQuery );