Ticket #36202: 36202.diff

src/wp-admin/js/common.js

@@ -1 @@
-/* global setUserSetting, ajaxurl, commonL10n, alert, confirm, pagenow */
+/* global setUserSetting, commonL10n, alert, confirm, pagenow */
 var showNotice, adminMenu, columns, validateForm, screenMeta;
 ( function( $, window, undefined ) {
         var $document = $( document ),
@@ -28 +28 @@
 
                         columns.saveManageColumnsState();
                 });
+
+                $( '#adv-settings' ).on( 'submit', columns.delaySubmitIfAjaxRequest );
         },
 
-        saveManageColumnsState : function() {
+        saveManageColumnsState : _.debounce( function() {
                 var hidden = this.hidden();
-                $.post(ajaxurl, {
-                        action: 'hidden-columns',
+
+                if ( columns.ajaxRequest ) {
+                        columns.ajaxRequest.abort();
+                }
+                columns.ajaxRequest = wp.ajax.post( 'hidden-columns', {
                         hidden: hidden,
-                        screenoptionnonce: $('#screenoptionnonce').val(),
+                        screenoptionnonce: $( '#screenoptionnonce' ).val(),
                         page: pagenow
                 });
+                columns.ajaxRequest.always( function() {
+                        columns.ajaxRequest = null;
+                } );
+        }, 2000, true ),
+
+        delaySubmitIfAjaxRequest: function( event ) {
+                if ( columns.ajaxRequest ) {
+                        event.preventDefault();
+                        columns.ajaxRequest.always( function() {
+                                $( event.currentTarget ).trigger( event.type );
+                        } );
+                } else {
+                        return true;
+                }
         },
 
         checked : function(column) {

src/wp-admin/js/nav-menu.js

@@ -603 +603 @@
                         // hide fields
                         api.menuList.hideAdvancedMenuItemFields();
 
-                        $('.hide-postbox-tog').click(function () {
-                                var hidden = $( '.accordion-container li.accordion-section' ).filter(':hidden').map(function() { return this.id; }).get().join(',');
-                                $.post(ajaxurl, {
-                                        action: 'closed-postboxes',
-                                        hidden: hidden,
-                                        closedpostboxesnonce: jQuery('#closedpostboxesnonce').val(),
-                                        page: 'nav-menus'
-                                });
-                        });
+                        $( '.hide-postbox-tog' ).click( api.handleMenuScreenOptionClick );
                 },
 
+                /**
+                 * Handle click on menu screen option checkbox.
+                 *
+                 * On click, create a debounced wp.ajax call, based on which box is clicked.
+                 * This toggles the displayed state of the the menu item field.
+                 *
+                 * @returns {void}
+                 */
+                handleMenuScreenOptionClick : _.debounce( function() {
+                        var hidden = $( '.accordion-container li.accordion-section' ).filter( ':hidden' ).map(function() { return this.id; }).get().join( ',' );
+
+                        if ( api.menuList._updateBasedOnScreenOptions ) {
+                                api.menuList._updateBasedOnScreenOptions.abort();
+                        }
+                        api.menuList._updateBasedOnScreenOptions = wp.ajax.post( 'closed-postboxes', {
+                                hidden: hidden,
+                                closedpostboxesnonce: $( '#closedpostboxesnonce' ).val(),
+                                page: 'nav-menus'
+                        } );
+                        api.menuList._updateBasedOnScreenOptions.always( function() {
+                                api.menuList._updateBasedOnScreenOptions = null;
+                        } );
+                }, 2000 ),
+
                 initSortables : function() {
                         var currentDepth = 0, originalDepth, minDepth, maxDepth,
                                 prev, next, prevBottom, nextThreshold, helperHeight, transport,

src/wp-includes/script-loader.php

@@ -75 +75 @@
                 'secure' => (string) ( 'https' === parse_url( site_url(), PHP_URL_SCHEME ) ),
         ) );
 
-        $scripts->add( 'common', "/wp-admin/js/common$suffix.js", array('jquery', 'hoverIntent', 'utils'), false, 1 );
+        $scripts->add( 'common', "/wp-admin/js/common$suffix.js", array( 'jquery', 'hoverIntent', 'utils', 'underscore', 'wp-util' ), false, 1 );
         did_action( 'init' ) && $scripts->localize( 'common', 'commonL10n', array(
                 'warnDelete' => __( "You are about to permanently delete these items.\n  'Cancel' to stop, 'OK' to delete." ),
                 'dismiss'    => __( 'Dismiss this notice.' ),
@@ -724 +724 @@
                 ) );
 
                 // Navigation Menus
-                $scripts->add( 'nav-menu', "/wp-admin/js/nav-menu$suffix.js", array( 'jquery-ui-sortable', 'jquery-ui-draggable', 'jquery-ui-droppable', 'wp-lists', 'postbox', 'json2' ) );
+                $scripts->add( 'nav-menu', "/wp-admin/js/nav-menu$suffix.js", array( 'jquery-ui-sortable', 'jquery-ui-draggable', 'jquery-ui-droppable', 'wp-lists', 'postbox', 'json2', 'underscore', 'wp-util' ) );
                 did_action( 'init' ) && $scripts->localize( 'nav-menu', 'navMenuL10n', array(
                         'noResultsFound' => __( 'No results found.' ),
                         'warnDeleteMenu' => __( "You are about to permanently delete this menu. \n 'Cancel' to stop, 'OK' to delete." ),