mirror of
https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor
synced 2024-11-25 23:05:35 +00:00
7bcf35e0e8
This happens when the <span> is the start of unwrapped content. The converter logic to look at the tag name in wrapping mode doesn't kick in because we're not yet in wrapping mode at that point. The core issue was that previously, we relied on the document structure/state to choose between alienBlock and alienInline, and only used the tag name where the document structure was ambiguous (wrapping). Changed this to be the other way around: we now rely primarily on the tag name, and if that doesn't match what we expect based on the document structure, we work around that if possible. Specifically: * inline tag in our wrapper --> inline alien * block tag in our wrapper --> close wrapper, block alien * inline tag in wrapper that's not ours --> inline alien * block tag in wrapper that's not ours --> *inline* alien * inline tag in structural location --> open wrapper, inline alien * block tag in structural location --> block alien * inline tag in content location --> inline alien * block tag in content location --> *inline* alien only in the fourth and the last case do we need to use the "wrong" alien type to preserve document validity, and it will always be inline where block was expected, which should reduce UI issues. The condensed version of the above, which is used in the code, is: * If in a non-wrapper content location, use inline * If in a wrapper that's not ours, use inline * Otherwise, decide based on tag name * Open or close wrapper if needed ve.dm.Converter: * Replace isInline logic in createAlien() with the above * Factor out code to start wrapping (was duplicated) into startWrapping() * Call startWrapping() if createAlien() returns an alienInline and we're in a structural location Tests: * Add test cases with aliens at the start and end of unwrapped content ** The first one failed prior to these changes and now passes, the second one was already passing * Fix about group test case, was exhibiting the bug that this commit fixes Change-Id: I657aa0ff5bc2b57cd48ef8a99c8ca930936c03b8 |
||
|---|---|---|
| .. | ||
| annotations | ||
| nodes | ||
| ve.dm.Annotation.js | ||
| ve.dm.AnnotationFactory.js | ||
| ve.dm.BranchNode.js | ||
| ve.dm.Converter.js | ||
| ve.dm.Document.js | ||
| ve.dm.DocumentSlice.js | ||
| ve.dm.DocumentSynchronizer.js | ||
| ve.dm.js | ||
| ve.dm.LeafNode.js | ||
| ve.dm.Node.js | ||
| ve.dm.NodeFactory.js | ||
| ve.dm.Surface.js | ||
| ve.dm.SurfaceFragment.js | ||
| ve.dm.Transaction.js | ||
| ve.dm.TransactionProcessor.js | ||