mirror of
https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor
synced 2024-09-28 04:36:49 +00:00
085a6f0985
The converter was misbehaving when handling <p>s inside <span>s. This can't be expressed in the linmod, but it would try to anyway. <span><p> would result in too many paragraph closing elements, leading to an exception in ve.dm.Document complaining about unbalanced input. <span>\n<p> would result in an exception in the converter itself while trying to perform whitespace preservation on the newline. This change makes the converter detect these scenarios and alienate the offending node. So <span><p>Foo</p></span> converts to a wrapper paragraph containing an alienInline whose HTML is "<p>Foo</p>" and which is annotated with a TextStyleSpanAnnotation. ve.dm.Converter.getDomFromData(): * Change the criteria for alienBlock vs alienInline ** Only infer from the node type if we're in wrapping mode AND we're at the same level where the wrapping started (wrappingIsOurs). If the latter isn't the case, we can't split the wrapper in the block case because we're at the wrong level. ** Use alienInline not only if the branch is a content branch, but also if there are active annotations. This catches e.g. <li><b><p> (and generally <span><p> on the top level). * Before converting a child element, check that the child isn't "bad". Bad children are non-content children in content branches, and non-content children encountered within a wrapper that we can't split. Only good children are converted, and bad children are alienated (cue Santa/Sinterklaas jokes). * Add childIsContent and rename branchIsContent to branchHasContent Change-Id: If420ae80ab0777424a9a5517335ef9d0170e87ae |
||
|---|---|---|
| .. | ||
| annotations | ||
| nodes | ||
| ve.dm.Annotation.js | ||
| ve.dm.AnnotationFactory.js | ||
| ve.dm.BranchNode.js | ||
| ve.dm.Converter.js | ||
| ve.dm.Document.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 | ||