This repository has been archived by the owner on Jun 26, 2020. It is now read-only.
Temporarily substitute wrap and unwrap operations with inserts and moves #1565
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…operty. Renamed `SplitOperation#position` to `#splitPosition`.
|
These errors are because of block-quote's post fixer is not available in that build. |
pjasiun
reviewed
Oct 1, 2018
src/model/differ.js
Outdated
| @@ -238,9 +232,7 @@ export default class Differ { | |||
|
|
|||
| // If the wrap took the element from the graveyard, mark that the element from the graveyard was removed. | |||
There was a problem hiding this comment.
Mmmm... I don't understand why?
There was a problem hiding this comment.
As I mentioned belove, we should remove all the code related to wrap and unwrap operations which is not used anymore.
pjasiun
reviewed
Oct 1, 2018
| @@ -119,7 +119,12 @@ export default class MergeOperation extends Operation { | |||
| * @returns {module:engine/model/operation/splitoperation~SplitOperation} | |||
| */ | |||
| getReversed() { | |||
| return new SplitOperation( this.targetPosition, this.howMany, this.graveyardPosition, this.baseVersion + 1 ); | |||
| const targetPosition = this.targetPosition._getTransformedByMergeOperation( this ); | |||
pjasiun
reviewed
Oct 1, 2018
| * @param {Number} howMany Total offset size of elements that are in the split element after `position`. | ||
| * @param {module:engine/model/position~Position} insertionPosition Position at which the clone of split element | ||
| * (or element from graveyard) will be inserted. |
pjasiun
reviewed
Oct 1, 2018
src/model/writer.js
Outdated
| @@ -653,7 +651,8 @@ export default class Writer { | |||
| do { | |||
| const version = splitElement.root.document ? splitElement.root.document.version : null; | |||
| const howMany = splitElement.maxOffset - position.offset; | |||
| const split = new SplitOperation( position, howMany, null, version ); | |||
| const insertionPosition = SplitOperation.getInsertionPosition( position ); | |||
| const split = new SplitOperation( position, howMany, insertionPosition, null, version ); | |||
There was a problem hiding this comment.
The way you create this operation is too complicated. :/
|
We should remove the code and tests related to wrap operations the model (position, differ, etc.). It can be done in a follow-up. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Suggested merge commit message (convention)
Internal: Removed usage of
WrapOperationandUnwrapOperation, usingMoveOperationandInsertOperationinstead. ChangedSplitOperation#insertionPositionto a settable. RenamedSplitOperation#positiontoSplitOperation#splitPosition. Closes ckeditor/ckeditor5#4432.