8
0
Просмотр исходного кода

Fix: Improved MoveOperation x MergeOperation transformation.

Szymon Cofalik 7 лет назад
Родитель
Сommit
596ded3da8
1 измененных файлов с 8 добавлено и 1 удалено
  1. 8 1
      packages/ckeditor5-engine/src/model/operation/transform.js

+ 8 - 1
packages/ckeditor5-engine/src/model/operation/transform.js

@@ -1339,7 +1339,14 @@ setTransformation( MoveOperation, MergeOperation, ( a, b, context ) => {
 			//			it would be a move operation that moves 0 nodes, so maybe it is better just to return no-op.
 			//
 			if ( a.howMany == 1 ) {
-				return getNoOp();
+				if ( !context.bWasUndone ) {
+					return getNoOp();
+				} else {
+					a.sourcePosition = Position.createFromPosition( b.graveyardPosition );
+					a.targetPosition = a.targetPosition._getTransformedByMergeOperation( b );
+
+					return [ a ];
+				}
 			}
 		}
 	}