Ticket #28322: 28322.patch

src/wp-includes/js/tinymce/plugins/wpview/plugin.js

@@ -86 +86 @@
         }
 
         function select( viewNode ) {
-                var clipboard,
-                        dom = editor.dom;
+                var clipboard;
 
                 if ( ! viewNode ) {
                         return;
@@ -94 +93 @@
                 }
 
                 if ( viewNode !== selected ) {
-                        // Make sure that the editor is focused.
-                        // It is possible that the editor is not focused when the mouse event fires
-                        // without focus, the selection will not work properly.
-                        editor.getBody().focus();
-
                         deselect();
                         selected = viewNode;
-                        dom.setAttrib( viewNode, 'data-mce-selected', 1 );
+                        $( viewNode ).attr( 'data-mce-selected', 1 );
 
-                        clipboard = dom.create( 'div', {
+                        clipboard = editor.dom.create( 'div', {
                                 'class': 'wpview-clipboard',
                                 'contenteditable': 'true'
                         }, wp.mce.views.getText( viewNode ) );
 
-                        editor.dom.select( '.wpview-body', viewNode )[0].appendChild( clipboard );
+                        $( '.wpview-body', viewNode ).append( clipboard );
 
                         // Both of the following are necessary to prevent manipulating the selection/focus
-                        dom.bind( clipboard, 'beforedeactivate focusin focusout', _stop );
-                        dom.bind( selected, 'beforedeactivate focusin focusout', _stop );
+                        $( clipboard ).on( 'beforedeactivate focusin focusout', _stop );
+                        $( selected ).on( 'beforedeactivate focusin focusout', _stop );
 
-                        // select the hidden div
+                        // Make sure that the editor is focused.
+                        // It is possible that the editor is not focused when the mouse event fires
+                        // without focus, the selection will not work properly.
+                        // Need to select the (visible) wpView wrap node first to prevent Chrome from jumping to the top.
+                        editor.selection.select( viewNode );
+                        editor.focus();
+
+                        // Select the hidden clipboard div so when the users try to copy the selection,
+                        // they will copy the string used to create the wpView.
                         if ( isios ) {
                                 editor.selection.select( clipboard );
                         } else {
@@ -130 +132 @@
          * Deselect a selected view and remove clipboard
          */
         function deselect() {
-                var clipboard,
-                        dom = editor.dom;
-
                 if ( selected ) {
-                        clipboard = editor.dom.select( '.wpview-clipboard', selected )[0];
-                        dom.unbind( clipboard );
-                        dom.remove( clipboard );
-
-                        dom.unbind( selected, 'beforedeactivate focusin focusout click mouseup', _stop );
-                        dom.setAttrib( selected, 'data-mce-selected', null );
+                        $( selected ).off( 'beforedeactivate focusin focusout click mouseup', _stop )
+                                .removeAttr( 'data-mce-selected' )
+                                .find( '.wpview-clipboard' ).off().remove();
                 }
 
                 selected = null;