Skip to content

Commit

Permalink
Merge branch 't/13451'
Browse files Browse the repository at this point in the history
  • Loading branch information
Reinmar committed Jul 3, 2015
2 parents 9bfa605 + 27ae5f8 commit efd5f1f
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions plugins/clipboard/plugin.js
Expand Up @@ -1294,12 +1294,12 @@
clipboard.initDragDataTransfer( evt, editor );

// Save drag range globally for cross editor D&D.
if ( clipboard.dragRange = editor.getSelection().getRanges()[ 0 ] ) {
// Store number of children, so we can later tell if any text node was split on drop. (#13011, #13447)
if ( CKEDITOR.env.ie && CKEDITOR.env.version < 10 ) {
clipboard.dragStartContainerChildCount = getContainerChildCount( clipboard.dragRange.startContainer );
clipboard.dragEndContainerChildCount = getContainerChildCount( clipboard.dragRange.endContainer );
}
var dragRange = clipboard.dragRange = editor.getSelection().getRanges()[ 0 ];

// Store number of children, so we can later tell if any text node was split on drop. (#13011, #13447)
if ( CKEDITOR.env.ie && CKEDITOR.env.version < 10 ) {
clipboard.dragStartContainerChildCount = dragRange ? getContainerChildCount( dragRange.startContainer ) : null;
clipboard.dragEndContainerChildCount = dragRange ? getContainerChildCount( dragRange.endContainer ) : null;
}
}, null, null, 2 );

Expand Down

0 comments on commit efd5f1f

Please sign in to comment.