Changeset 39503

Timestamp:

12/05/2016 04:48:16 PM (10 years ago)

Author:

westonruter

Message:

Customize: Prevent posts/pages imported via starter content from being dropped when adding post/page stubs via nav menus and the dropdown-pages control.

Props westonruter, dlh for testing.
Merges [39502] onto 4.7 branch.
Fixes #39071 for 4.7.

Location:

branches/4.7

Files:

• . (modified) (1 prop)
• src/wp-admin/js/customize-nav-menus.js (modified) (3 diffs)

branches/4.7/src/wp-admin/js/customize-nav-menus.js

@@ -80 +80 @@
         });
         api.Menus.availableMenuItems = new api.Menus.AvailableItemCollection( api.Menus.data.availableMenuItems );
-
-        api.Menus.insertedAutoDrafts = [];
 
         /**
@@ -105 +103 @@
                 request.done( function( response ) {
                         if ( response.post_id ) {
-                                api.Menus.insertedAutoDrafts.push( response.post_id );
-                                api( 'nav_menus_created_posts' ).set( _.clone( api.Menus.insertedAutoDrafts ) );
+                                api( 'nav_menus_created_posts' ).set(
+                                        api( 'nav_menus_created_posts' ).get().concat( [ response.post_id ] )
+                                );
 
                                 if ( 'page' === params.post_type ) {
@@ -2798 +2797 @@
                                 api.Menus.applySavedData( data );
                         }
-
-                        // Reset list of inserted auto draft post IDs.
-                        api.Menus.insertedAutoDrafts = [];
+                } );
+
+                /*
+                 * Reset the list of posts created in the customizer once published.
+                 * The setting is updated quietly (bypassing events being triggered)
+                 * so that the customized state doesn't become immediately dirty.
+                 */
+                api.state( 'changesetStatus' ).bind( function( status ) {
+                        if ( 'publish' === status ) {
+                                api( 'nav_menus_created_posts' )._value = [];
+                        }
                 } );