Changeset 36983

Timestamp:

03/13/2016 10:55:01 PM (9 years ago)

Author:

azaozz

Message:

TinyMCE: when dragging, prevent error when a range cannot be created at the drop location.

Fixes #36229.

File:

• trunk/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js (modified) (2 diffs)

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

@@ -1006 +1006 @@
 
             // 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 ) {
@@ -1012 +1012 @@
 
                 editor.undoManager.transact( function() {
-                    editor.selection.setRng( rng );
+                    if ( rng ) {
+                        editor.selection.setRng( rng );
+                    }
+
                     editor.selection.setNode( wrap );
                     dom.remove( wrap );