Changeset 41947

Timestamp:

10/19/2017 05:41:05 PM (8 years ago)

Author:

westonruter

Message:

Customize: Prevent drawing attention to save button if status unchanged from publish; account for changes to status/date when alerting about unsaved changes.

Also fix malformed ESLint directive from [41933].

Amends [41932].
See #39896, #42211.

Location:

trunk/src/wp-admin/js

Files:

• customize-controls.js (modified) (6 diffs)
• widgets/media-widgets.js (modified) (1 diff)

trunk/src/wp-admin/js/customize-controls.js

@@ -6987 +6987 @@
 
             section.expanded.bind( function( isExpanded ) {
+                var defaultChangesetStatus;
                 publishSettingsBtn.attr( 'aria-expanded', String( isExpanded ) );
                 publishSettingsBtn.toggleClass( 'active', isExpanded );
@@ -6992 +6993 @@
                 if ( isExpanded ) {
                     cancelHighlightScheduleButton();
-                } else if ( api.state( 'selectedChangesetStatus' ).get() !== api.state( 'changesetStatus' ).get() ) {
+                    return;
+                }
+
+                defaultChangesetStatus = api.state( 'changesetStatus' ).get();
+                if ( '' === defaultChangesetStatus || 'auto-draft' === defaultChangesetStatus ) {
+                    defaultChangesetStatus = 'publish';
+                }
+
+                if ( api.state( 'selectedChangesetStatus' ).get() !== defaultChangesetStatus ) {
                     highlightScheduleButton();
                 } else if ( 'future' === api.state( 'selectedChangesetStatus' ).get() && api.state( 'selectedChangesetDate' ).get() !== api.state( 'changesetDate' ).get() ) {
@@ -8480 +8489 @@
 
             function isCleanState() {
+                var defaultChangesetStatus;
 
                 /*
@@ -8489 +8499 @@
                 }
 
+                // Dirty if the changeset status has been changed but not saved yet.
+                defaultChangesetStatus = api.state( 'changesetStatus' ).get();
+                if ( '' === defaultChangesetStatus || 'auto-draft' === defaultChangesetStatus ) {
+                    defaultChangesetStatus = 'publish';
+                }
+                if ( api.state( 'selectedChangesetStatus' ).get() !== defaultChangesetStatus ) {
+                    return false;
+                }
+
+                // Dirty if scheduled but the changeset date hasn't been saved yet.
+                if ( 'future' === api.state( 'selectedChangesetStatus' ).get() && api.state( 'selectedChangesetDate' ).get() !== api.state( 'changesetDate' ).get() ) {
+                    return false;
+                }
+
                 return api.state( 'saved' ).get() && 'auto-draft' !== api.state( 'changesetStatus' ).get();
             }
@@ -8502 +8526 @@
             function startPromptingBeforeUnload() {
                 api.unbind( 'change', startPromptingBeforeUnload );
+                api.state( 'selectedChangesetStatus' ).unbind( startPromptingBeforeUnload );
+                api.state( 'selectedChangesetDate' ).unbind( startPromptingBeforeUnload );
 
                 // Prompt user with AYS dialog if leaving the Customizer with unsaved changes
@@ -8514 +8540 @@
             }
             api.bind( 'change', startPromptingBeforeUnload );
+            api.state( 'selectedChangesetStatus' ).bind( startPromptingBeforeUnload );
+            api.state( 'selectedChangesetDate' ).bind( startPromptingBeforeUnload );
 
             function requestClose() {

trunk/src/wp-admin/js/widgets/media-widgets.js

@@ -94 +94 @@
          */
         initialize: function( options ) {
-            var view = this, embedController; // eslint-disable-line consistent-thi
+            var view = this, embedController; // eslint-disable-line consistent-this
             wp.media.view.Embed.prototype.initialize.call( view, options );
             if ( 'image' !== view.controller.options.mimeType ) {