Changeset 33484

Timestamp:

07/29/2015 01:48:58 PM (9 years ago)

Author:

iseulde

Message:

TinyMCE: views: correct cursor position after paste

Fixes #33174.

Location:

trunk/src/wp-includes/js

Files:

• mce-view.js (modified) (2 diffs)
• tinymce/plugins/wpview/plugin.js (modified) (1 diff)

trunk/src/wp-includes/js/mce-view.js

@@ -422 +422 @@
         replaceMarkers: function() {
             this.getMarkers( function( editor, node ) {
+                var selected = node === editor.selection.getNode(),
+                    $viewNode;
+
                 if ( ! this.loader && $( node ).text() !== this.text ) {
                     editor.dom.setAttrib( node, 'data-wpview-marker', null );
@@ -427 +430 @@
                 }
 
-                editor.dom.replace(
-                    editor.dom.createFragment(
-                        '<div class="wpview-wrap" data-wpview-text="' + this.encodedText + '" data-wpview-type="' + this.type + '">' +
-                            '<p class="wpview-selection-before">\u00a0</p>' +
-                            '<div class="wpview-body" contenteditable="false">' +
-                                '<div class="wpview-content wpview-type-' + this.type + '"></div>' +
-                            '</div>' +
-                            '<p class="wpview-selection-after">\u00a0</p>' +
-                        '</div>'
-                    ),
-                    node
+                $viewNode = editor.$(
+                    '<div class="wpview-wrap" data-wpview-text="' + this.encodedText + '" data-wpview-type="' + this.type + '">' +
+                        '<p class="wpview-selection-before">\u00a0</p>' +
+                        '<div class="wpview-body" contenteditable="false">' +
+                            '<div class="wpview-content wpview-type-' + this.type + '"></div>' +
+                        '</div>' +
+                        '<p class="wpview-selection-after">\u00a0</p>' +
+                    '</div>'
                 );
+
+                editor.$( node ).replaceWith( $viewNode );
+
+                if ( selected ) {
+                    editor.wp.setViewCursor( false, $viewNode[0] );
+                }
             } );
         },

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

@@ -730 +730 @@
     editor.wp = editor.wp || {};
     editor.wp.getView = getView;
+    editor.wp.setViewCursor = setViewCursor;
 
     // Keep for back-compat.