Changeset 50031 for branches/5.6

Timestamp:

01/27/2021 07:50:30 PM (4 years ago)

Author:

whyisjake

Message:

Editor: Fix improper triggering of the "Are you sure" prompt when navigating away from the old, "classic" Edit Post screen and there are no changes. Was triggered when there is an instance of TinyMCE in the Excerpt postbox.

This brings the changes from [49807] to the 5.6 branch.

Props rodrigosprimo, jonathanstegall, kevin940726, azaozz, metalandcoffee, ifnoob.

Fixes #52038.

Location:

branches/5.6

Files:

• . (modified) (1 prop)
• src/js/_enqueues/admin/post.js (modified) (1 diff)
• src/js/_enqueues/wp/autosave.js (modified) (3 diffs)

branches/5.6/src/js/_enqueues/admin/post.js

@@ -489 +489 @@
      * show a confirmation dialog when there are unsaved changes.
      */
-    $(window).on( 'beforeunload.edit-post', function() {
-        var editor = typeof tinymce !== 'undefined' && tinymce.get('content');
-
-        if ( ( editor && ! editor.isHidden() && editor.isDirty() ) ||
-            ( wp.autosave && wp.autosave.server.postChanged() ) ) {
-
+    $( window ).on( 'beforeunload.edit-post', function( event ) {
+        var editor  = window.tinymce && window.tinymce.get( 'content' );
+        var changed = false;
+
+        if ( wp.autosave ) {
+            changed = wp.autosave.server.postChanged();
+        } else if ( editor ) {
+            changed = ( ! editor.isHidden() && editor.isDirty() );
+        }
+
+        if ( changed ) {
+            event.preventDefault();
+            // The return string is needed for browser compat.
+            // See https://developer.mozilla.org/en-US/docs/Web/API/Window/beforeunload_event.
             return __( 'The changes you made will be lost if you navigate away from this page.' );
         }

branches/5.6/src/js/_enqueues/wp/autosave.js

@@ -37 +37 @@
     function autosave() {
         var initialCompareString,
-            lastTriggerSave = 0,
-            $document = $(document);
+            initialCompareData = {},
+            lastTriggerSave    = 0,
+            $document          = $( document );
+
+        /**
+         * Sets the initial compare data.
+         *
+         * @since 5.6.1
+         */
+        function setInitialCompare() {
+            initialCompareData = {
+                post_title: $( '#title' ).val() || '',
+                content: $( '#content' ).val() || '',
+                excerpt: $( '#excerpt' ).val() || ''
+            };
+
+            initialCompareString = getCompareString( initialCompareData );
+        }
 
         /**
@@ -687 +703 @@
              */
             function postChanged() {
+                var changed = false;
+
+                // If there are TinyMCE instances, loop through them.
+                if ( window.tinymce ) {
+                    window.tinymce.each( [ 'content', 'excerpt' ], function( field ) {
+                        var editor = window.tinymce.get( field );
+
+                        if ( ! editor || editor.isHidden() ) {
+                            if ( $( '#' + field ).val() !== initialCompareData[ field ] ) {
+                                changed = true;
+                                // Break.
+                                return false;
+                            }
+                        } else if ( editor.isDirty() ) {
+                            changed = true;
+                            return false;
+                        }
+                    } );
+
+                    if ( $( '#title' ).val() !== initialCompareData.post_title ) {
+                        changed = true;
+                    }
+
+                    return changed;
+                }
+
                 return getCompareString() !== initialCompareString;
             }
@@ -833 +875 @@
          */
         $document.on( 'tinymce-editor-init.autosave', function( event, editor ) {
-            if ( editor.id === 'content' ) {
+            // Reset the initialCompare data after the TinyMCE instances have been initialized.
+            if ( 'content' === editor.id || 'excerpt' === editor.id ) {
                 window.setTimeout( function() {
                     editor.save();
-                    initialCompareString = getCompareString();
+                    setInitialCompare();
                 }, 1000 );
             }
         }).ready( function() {
-
             // Set the initial compare string in case TinyMCE is not used or not loaded first.
-            initialCompareString = getCompareString();
+            setInitialCompare();
         });