Make WordPress Core

Ticket #39103: 39103.0.dff

File 39103.0.dff, 1.3 KB (added by westonruter, 7 years ago)
Line 
1diff --git src/wp-admin/js/customize-nav-menus.js src/wp-admin/js/customize-nav-menus.js
2index b7556f6..a37d2c4 100644
3--- src/wp-admin/js/customize-nav-menus.js
4+++ src/wp-admin/js/customize-nav-menus.js
5@@ -1169,7 +1169,11 @@
6 
7                        // @todo It would be better if this was added directly on the setting itself, as opposed to the control.
8                        control.setting.validate = function( value ) {
9-                               return parseInt( value, 10 );
10+                               if ( '' === value ) {
11+                                       return 0;
12+                               } else {
13+                                       return parseInt( value, 10 );
14+                               }
15                        };
16 
17                        // Edit menu button.
18diff --git src/wp-includes/class-wp-customize-nav-menus.php src/wp-includes/class-wp-customize-nav-menus.php
19index ca1b72f..29c0c4d 100644
20--- src/wp-includes/class-wp-customize-nav-menus.php
21+++ src/wp-includes/class-wp-customize-nav-menus.php
22@@ -542,10 +542,12 @@ final class WP_Customize_Nav_Menus {
23                        }
24                }
25                $this->manager->add_dynamic_settings( $nav_menus_setting_ids );
26-               foreach ( $nav_menus_setting_ids as $setting_id ) {
27-                       $setting = $this->manager->get_setting( $setting_id );
28-                       if ( $setting ) {
29-                               $setting->preview();
30+               if ( ! $this->manager->doing_ajax( 'customize_save' ) ) {
31+                       foreach ( $nav_menus_setting_ids as $setting_id ) {
32+                               $setting = $this->manager->get_setting( $setting_id );
33+                               if ( $setting ) {
34+                                       $setting->preview();
35+                               }
36                        }
37                }
38