Merge branch 't/13059' into major

ckeditor · May 29, 2015 · fe4de43 · fe4de43
2 parents 475be1b + cf279dc
commit fe4de43
Show file tree

Hide file tree

Showing 2 changed files with 96 additions and 81 deletions.
diff --git a/plugins/clipboard/plugin.js b/plugins/clipboard/plugin.js
@@ -1394,9 +1394,11 @@
 				// Remove dragged content and make a snapshot.
 				dataTransfer.sourceEditor.fire( 'saveSnapshot' );
 
-				editable.extractHtmlFromRange( dragRange );
+				dataTransfer.sourceEditor.editable().extractHtmlFromRange( dragRange );
 
-				dataTransfer.sourceEditor.getSelection().reset();
+				// Make some selection before saving snapshot, otherwise error will be thrown, because
+				// there will be no valid selection after content is removed.
+				dataTransfer.sourceEditor.getSelection().selectRanges( [ dragRange ] );
 				dataTransfer.sourceEditor.fire( 'saveSnapshot' );
 			}