This repository has been archived by the owner on Jun 26, 2020. It is now read-only.
Additional improvements in OT #1498
Merged
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
…dn't really move any nodes.
…es that have boundaries in different roots.
pjasiun
reviewed
Aug 9, 2018
| @@ -30,12 +30,13 @@ export default class MergeOperation extends Operation { | |||
| * | |||
| * @param {module:engine/model/position~Position} sourcePosition Position inside the merged element. All nodes from that | |||
| * element after that position will be moved to {@link ~#targetPosition}. | |||
| * @param {Number} howMany | |||
pjasiun
reviewed
Aug 9, 2018
src/model/operation/transform.js
Outdated
|
|
||
| updateRelations( context, opA, opB ); | ||
| } | ||
| for ( let j = transformFrom; j < operationsB.length; ) { |
pjasiun
reviewed
Aug 9, 2018
src/model/operation/transform.js
Outdated
| // | ||
| // So, the final solution is to just expand the original range, but "fix" all the nodes that have "incorrect" `oldValue`. | ||
| // For example, in the highlight case above, we would need an operation to change `highlight="red"` to `null` so that | ||
| // the original attribute operation `null` -> `yellow` would be correct. |
pjasiun
reviewed
Aug 9, 2018
src/model/operation/transform.js
Outdated
| // Unwrap: | ||
| // <p>Foo</p><p>Bar</p><p>Xyz</p> | ||
| // | ||
| // Wrap with stronger wrap (`a`): |
There was a problem hiding this comment.
"(a)" can be removed or replaced with "(strong operation A)".
pjasiun
reviewed
Aug 9, 2018
src/model/operation/transform.js
Outdated
| @@ -77,6 +79,10 @@ export function transformSets( operationsA, operationsB, options ) { | |||
| return { operationsA, operationsB }; | |||
| } | |||
|
|
|||
| for ( const op of operationsA ) { | |||
| op.transformBy = 0; | |||
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)
Other: Added
MergeOperation#howManyandSplitOperation#howMany. Improvements inPositionandRangetransforming functions. Improvements in OT algorithms. Closes ckeditor/ckeditor5#4394. Closes ckeditor/ckeditor5#4396. Closes ckeditor/ckeditor5#4398.