Ticket #42530: 42530.3.diff

src/wp-admin/js/editor.js

@@ -270 +270 @@
                         if ( shortcodes ) {
                                 for ( var i = 0; i < shortcodes.length; i++ ) {
                                         var shortcode = shortcodes[ i ].replace( /^\[+/g, '' );
-        
+
                                         if ( result.indexOf( shortcode ) === -1 ) {
                                                 result.push( shortcode );
                                         }
@@ -581 +581 @@
 
                         removeSelectionMarker( startNode );
                         removeSelectionMarker( endNode );
+
+                        editor.save();
                 }
 
                 /**
@@ -623 +625 @@
 
                                 edTools = $( '#wp-content-editor-tools' ),
                                 edToolsHeight = 0,
-                                edToolsOffsetTop = 0;
+                                edToolsOffsetTop = 0,
+
+                                $scrollArea;
 
                         if ( edTools.length ) {
                                 edToolsHeight = edTools.height();
@@ -648 +652 @@
                          * subtracting the height. This gives the scroll position where the top of the editor tools aligns with
                          * the top of the viewport (under the Master Bar)
                          */
-                        var adjustedScroll = Math.max( selectionPosition - visibleAreaHeight / 2, edToolsOffsetTop - edToolsHeight );
+                        var adjustedScroll;
+                        if ( editor.settings.wp_autoresize_on ) {
+                                $scrollArea = $( 'html,body' );
+                                adjustedScroll = Math.max( selectionPosition - visibleAreaHeight / 2, edToolsOffsetTop - edToolsHeight );
+                        } else {
+                                $scrollArea = $( editor.contentDocument ).find( 'html,body' );
+                                adjustedScroll = elementTop;
+                        }
 
-                        $( 'html,body' ).animate( {
+                        $scrollArea.animate( {
                                 scrollTop: parseInt( adjustedScroll, 10 )
                         }, 100 );
                 }