From 2c50a6dd24260046b54cc74366323ca00e068702 Mon Sep 17 00:00:00 2001 From: Andrew Ozz Date: Wed, 19 Apr 2017 22:09:44 +0000 Subject: [PATCH] TinyMCE: Fix cursor position after updating a wpview node. Fix hiding the inline toolbar on editor blur. Props iseulde, azaozz. Fixes #40480 for trunk. git-svn-id: https://develop.svn.wordpress.org/trunk@40481 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/js/mce-view.js | 3 +++ src/wp-includes/js/tinymce/plugins/wordpress/plugin.js | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/wp-includes/js/mce-view.js b/src/wp-includes/js/mce-view.js index 21b2c87b6a..397af63867 100644 --- a/src/wp-includes/js/mce-view.js +++ b/src/wp-includes/js/mce-view.js @@ -729,6 +729,9 @@ $( node ).data( 'rendered', false ); editor.dom.setAttrib( node, 'data-wpview-text', encodeURIComponent( text ) ); wp.mce.views.createInstance( type, text, match.options, force ).render(); + + editor.selection.select( node ); + editor.nodeChanged(); editor.focus(); return true; diff --git a/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js b/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js index 20cdcd49ac..08e3cf78c9 100644 --- a/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js +++ b/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js @@ -992,7 +992,7 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) { function hide( event ) { if ( activeToolbar ) { - if ( activeToolbar.tempHide || event.type === 'hide' ) { + if ( activeToolbar.tempHide || event.type === 'hide' || event.type === 'blur' ) { activeToolbar.hide(); activeToolbar = false; } else if ( (