Changeset 32098

Timestamp:

04/09/2015 07:06:41 PM (10 years ago)

Author:

azaozz

Message:

Press This:

• Fix focusing the Standard Editor link after saving draft, if the user has not focused another element.
• Reset the Save Draft button on node change in the editor.

See #31923.

File:

• trunk/src/wp-admin/js/press-this.js (modified) (8 diffs)

trunk/src/wp-admin/js/press-this.js

@@ -7 +7 @@
         var editor, $mediaList, $mediaThumbWrap,
             saveAlert             = false,
+            editLinkVisible       = false,
             textarea              = document.createElement( 'textarea' ),
             sidebarIsOpen         = false,
@@ -103 +104 @@
         function showSpinner() {
             $( '.spinner' ).addClass( 'is-active' );
-            $( '.post-actions button' ).each( function() {
-                $( this ).attr( 'disabled', 'disabled' );
-            } );
+            $( '.post-actions button' ).attr( 'disabled', 'disabled' );
         }
 
@@ -113 +112 @@
         function hideSpinner() {
             $( '.spinner' ).removeClass( 'is-active' );
-            $( '.post-actions button' ).each( function() {
-                $( this ).removeAttr( 'disabled' );
-            } );
+            $( '.post-actions button' ).removeAttr( 'disabled' );
         }
 
@@ -167 +164 @@
          */
         function submitPost( action ) {
-            var data;
+            var data,
+                keepFocus = $( document.activeElement ).hasClass( 'draft-button' );
 
             saveAlert = false;
@@ -187 +185 @@
                 clearNotices();
             }).done( function( response ) {
-                var $link, $button, keepFocus;
+                var $link, $button;
 
                 if ( ! response.success ) {
@@ -204 +202 @@
                     $link = $( '.edit-post-link' );
                     $button = $( '.draft-button' );
-
-                    if ( document.activeElement && document.activeElement.className.indexOf( 'draft-button' ) > -1 ) {
-                        keepFocus = true;
-                    }
+                    editLinkVisible = true;
 
                     $button.fadeOut( 200, function() {
                         $button.removeClass( 'is-saving' );
-                        $link.fadeIn( 200 );
-
-                        if ( keepFocus ) {
-                            $link.focus();
-                        }
+                        $link.fadeIn( 200, function() {
+                            var active = document.activeElement;
+                            // Different browsers move the focus to different places when the button is disabled.
+                            if ( keepFocus && ( active === $button[0] || $( active ).hasClass( 'post-actions' ) || active.nodeName === 'BODY' ) ) {
+                                $link.focus();
+                            }
+                        });
                     });
                 }
@@ -224 +221 @@
 
         function resetDraftButton() {
-            $( '.edit-post-link' ).fadeOut( 200, function() {
-                $( '.draft-button' ).removeClass( 'is-saving' ).fadeIn( 200 );
-            });
+            if ( editLinkVisible ) {
+                editLinkVisible = false;
+
+                $( '.edit-post-link' ).fadeOut( 200, function() {
+                    $( '.draft-button' ).removeClass( 'is-saving' ).fadeIn( 200 );
+                });
+            }
         }
 
@@ -656 +657 @@
                 editor = ed;
 
-                function focus() {
+                editor.on( 'nodechange', function() {
                     hasSetFocus = true;
                     resetDraftButton();
-                }
-
-                if ( window.tinymce.Env.iOS ) {
-                    editor.on( 'click', focus );
-                } else {
-                    editor.on( 'focus', focus );
-                }
+                } );
             }).on( 'click.press-this keypress.press-this', '.suggested-media-thumbnail', function( event ) {
                 if ( event.type === 'click' || event.keyCode === 13 ) {