瀏覽代碼

Internal: DataController#deleteContent node merging is now a default behaviour.

Szymon Kupś 8 年之前
父節點
當前提交
e8275b346a
共有 1 個文件被更改,包括 3 次插入3 次删除
  1. 3 3
      packages/ckeditor5-enter/src/entercommand.js

+ 3 - 3
packages/ckeditor5-enter/src/entercommand.js

@@ -60,12 +60,12 @@ function enterBlock( dataController, batch, selection, schema ) {
 	if ( isSelectionEmpty ) {
 		splitBlock( batch, selection, range.start );
 	} else {
-		const shouldMerge = range.start.isAtStart && range.end.isAtEnd;
+		const leaveUnmerged = !( range.start.isAtStart && range.end.isAtEnd );
 		const isContainedWithinOneElement = ( startElement == endElement );
 
-		dataController.deleteContent( selection, batch, { merge: shouldMerge } );
+		dataController.deleteContent( selection, batch, { leaveUnmerged } );
 
-		if ( !shouldMerge ) {
+		if ( leaveUnmerged ) {
 			// Partially selected elements.
 			//
 			// <h>x[xx]x</h>		-> <h>x^x</h>			-> <h>x</h><h>^x</h>