X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/0459461f9ea42e0b090759ff6fe5f48360bef750..refs/tags/wordpress-4.5:/wp-admin/js/customize-widgets.js?ds=sidebyside diff --git a/wp-admin/js/customize-widgets.js b/wp-admin/js/customize-widgets.js index 820e8e3c..fee74cfe 100644 --- a/wp-admin/js/customize-widgets.js +++ b/wp-admin/js/customize-widgets.js @@ -34,7 +34,7 @@ multi_number: null, name: null, id_base: null, - transport: 'refresh', + transport: null, params: [], width: null, height: null, @@ -663,7 +663,7 @@ */ _setupReorderUI: function() { var self = this, selectSidebarItem, $moveWidgetArea, - $reorderNav, updateAvailableSidebars; + $reorderNav, updateAvailableSidebars, template; /** * select the provided sidebar list item in the move widget area @@ -681,8 +681,10 @@ * Add the widget reordering elements to the widget control */ this.container.find( '.widget-title-action' ).after( $( api.Widgets.data.tpl.widgetReorderNav ) ); - $moveWidgetArea = $( - _.template( api.Widgets.data.tpl.moveWidgetArea, { + + + template = _.template( api.Widgets.data.tpl.moveWidgetArea ); + $moveWidgetArea = $( template( { sidebars: _( api.Widgets.registeredSidebars.toArray() ).pluck( 'attributes' ) } ) ); @@ -959,7 +961,7 @@ * comparing the loaded form with the sanitized form, whose fields will * be aligned to copy the sanitized over. The elements returned by this * are passed into this._getInputsSignature(), and they are iterated - * over when copying sanitized values over to the the form loaded. + * over when copying sanitized values over to the form loaded. * * @param {jQuery} container element in which to look for inputs * @returns {jQuery} inputs @@ -1107,7 +1109,7 @@ params = {}; params.action = 'update-widget'; params.wp_customize = 'on'; - params.nonce = api.Widgets.data.nonce; + params.nonce = api.settings.nonce['update-widget']; params.theme = api.settings.theme.stylesheet; params.customized = wp.customize.previewer.query().customized; @@ -1829,7 +1831,7 @@ } }); - if ( ! widgetControls.length ) { + if ( 0 === widgetControls.length || ( 1 === api.Widgets.registeredSidebars.length && widgetControls.length <= 1 ) ) { this.container.find( '.reorder-toggle' ).hide(); return; } else { @@ -1980,7 +1982,7 @@ isExistingWidget = api.has( settingId ); if ( ! isExistingWidget ) { settingArgs = { - transport: 'refresh', + transport: api.Widgets.data.selectiveRefreshableWidgets[ widget.get( 'id_base' ) ] ? 'postMessage' : 'refresh', previewer: this.setting.previewer }; setting = api.create( settingId, settingId, '', settingArgs ); @@ -2058,11 +2060,6 @@ sidebar_widgets: api.Widgets.SidebarControl }); - // Refresh the nonce if login sends updated nonces over. - api.bind( 'nonce-refresh', function( nonces ) { - api.Widgets.data.nonce = nonces['update-widget']; - }); - /** * Init Customizer for widgets. */