From 8f8b1001ad8891dc82f1ed5eb6166433679cb603 Mon Sep 17 00:00:00 2001 From: Andrew Ozz Date: Sun, 13 Mar 2016 22:55:01 +0000 Subject: [PATCH] TinyMCE: when dragging, prevent error when a range cannot be created at the drop location. Fixes #36229. git-svn-id: https://develop.svn.wordpress.org/trunk@36983 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js b/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js index 979ddaf496..50045e7950 100644 --- a/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js +++ b/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js @@ -1005,13 +1005,16 @@ tinymce.PluginManager.add( 'wpeditimage', function( editor ) { rng = tinymce.dom.RangeUtils.getCaretRangeFromPoint( event.clientX, event.clientY, editor.getDoc() ); // Don't allow anything to be dropped in a captioned image. - if ( dom.getParent( rng.startContainer, '.mceTemp' ) ) { + if ( rng && dom.getParent( rng.startContainer, '.mceTemp' ) ) { event.preventDefault(); } else if ( wrap ) { event.preventDefault(); editor.undoManager.transact( function() { - editor.selection.setRng( rng ); + if ( rng ) { + editor.selection.setRng( rng ); + } + editor.selection.setNode( wrap ); dom.remove( wrap ); } );