sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

TinyMCE: views: correct cursor position after paste

Browse Source 
Fixes #33174.


git-svn-id: https://develop.svn.wordpress.org/trunk@33484 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Ella Iseulde Van Dorpe 2015-07-29 13:48:58 +00:00
parent 8db3eeec7d
commit b5c42d6b33
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/wp-includes/js/mce-view.js
View File

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

1
src/wp-includes/js/tinymce/plugins/wpview/plugin.js
View File

@ -729,6 +729,7 @@ tinymce.PluginManager.add( 'wpview', function( editor ) {
// Add to editor.wp // Add to editor.wp
editor.wp = editor.wp || {}; editor.wp = editor.wp || {};
editor.wp.getView = getView; editor.wp.getView = getView;
editor.wp.setViewCursor = setViewCursor;
// Keep for back-compat. // Keep for back-compat.
return { return {