wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-15 10:35:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Whitespace between unwrapped inline nodes assigned to paragraph"

Browse source
This commit is contained in:
jenkins-bot 2013-05-10 17:13:15 +00:00 committed by Gerrit Code Review
parent f966e9c41d 328dd8e21f
commit ff15fbf21b
2 changed files with 38 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
modules/ve/dm/ve.dm.Converter.js
View file

@ -590,6 +590,12 @@ ve.dm.Converter.prototype.getDataFromDomRecursion = function ( domElement, wrapp
}
}
// If we're inserting content into a wrapper, any wrappedWhitespace
// up to this point can be considered dealt with
if ( context.inWrapper && childIsContent ) {
wrappedWhitespace = '';
}
// Annotate child
if ( childIsContent && !context.annotations.isEmpty() ) {
childDataElements[0].annotations = context.annotations.getIndexes().slice();

32
modules/ve/test/dm/ve.dm.example.js
View file

@ -1621,6 +1621,38 @@ ve.dm.example.domToDataCases = {
{ 'type': '/paragraph' }
]
},
'whitespace between unwrapped inline nodes': {
'html':
'<body>' +
'<span typeof="mw:Entity">c</span> <span typeof="mw:Entity">d</span>\n<span typeof="mw:Entity">e</span>' +
'</body>',
'data': [
{
'type': 'paragraph',
'internal': {
'generated': 'wrapper'
}
},
{
'type': 'MWentity',
'attributes': { 'character': 'c', 'html/0/typeof': 'mw:Entity' }
},
{ 'type': '/MWentity' },
' ',
{
'type': 'MWentity',
'attributes': { 'character': 'd', 'html/0/typeof': 'mw:Entity' }
},
{ 'type': '/MWentity' },
'\n',
{
'type': 'MWentity',
'attributes': { 'character': 'e', 'html/0/typeof': 'mw:Entity' }
},
{ 'type': '/MWentity' },
{ 'type': '/paragraph' },
]
},
'whitespace preservation in headings': {
'html': '<body><h2>Foo</h2><h2> Bar</h2><h2>Baz </h2><h2> Quux </h2></body>',
'data': [