wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-09-26 19:56:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Extend empty document check to check for meta-only data"

Browse source
This commit is contained in:
jenkins-bot 2013-07-15 16:18:50 +00:00 committed by Gerrit Code Review
parent bc1f499e72 aaf4f5b134
commit 5a5fb6030d
3 changed files with 32 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/ve-mw/test/dm/ve.dm.mwExample.js
View file

@ -1472,6 +1472,8 @@ ve.dm.mwExample.domToDataCases = {
} } ]
},
{ 'type': '/mwDefaultSort' },
{ 'type': 'paragraph', 'internal': { 'generated': 'empty' } },
{ 'type': '/paragraph' },
{ 'type': 'internalList' },
{ 'type': '/internalList' }
]

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

@ -520,10 +520,16 @@ ve.dm.Converter.prototype.getDataFromDomRecursion = function ( domElement, wrapp
}
return aboutGroup;
}
function isAllAlienMeta( data ) {
var i;
function isAllInstanceOf( data, targetClass ) {
var i, type, itemClass;
for ( i = data.length - 1; i >= 0; i-- ) {
if ( !data[i].type || ( data[i].type !== 'alienMeta' && data[i].type !== '/alienMeta' ) ) {
type = ve.dm.LinearData.static.getType( data[i] );
if ( type ) {
itemClass = modelRegistry.lookup( type ) || ve.dm.AlienNode;
if ( !( itemClass.prototype === targetClass.prototype || itemClass.prototype instanceof targetClass ) ) {
return false;
}
} else {
return false;
}
}
@ -533,6 +539,7 @@ ve.dm.Converter.prototype.getDataFromDomRecursion = function ( domElement, wrapp
var i, childDomElement, childDomElements, childDataElements, text, childTypes, matches,
wrappingParagraph, prevElement, childAnnotations, modelName, modelClass,
annotation, childIsContent, aboutGroup, htmlAttributes,
modelRegistry = this.modelRegistry,
data = [],
nextWhitespace = '',
wrappedWhitespace = '',
@ -606,7 +613,7 @@ ve.dm.Converter.prototype.getDataFromDomRecursion = function ( domElement, wrapp
childAnnotations.push( annotation );
childDataElements = this.getDataFromDomRecursion( childDomElement, undefined, childAnnotations );
if ( !childDataElements.length || isAllAlienMeta( childDataElements ) ) {
if ( !childDataElements.length || isAllInstanceOf( childDataElements, ve.dm.AlienMetaItem ) ) {
// Empty annotation, create a meta item
childDataElements = this.createDataElements( ve.dm.AlienMetaItem, childDomElements );
childDataElements.push( { 'type': '/' + childDataElements[0].type } );
@ -917,11 +924,11 @@ ve.dm.Converter.prototype.getDataFromDomRecursion = function ( domElement, wrapp
data.push( { 'type': '/' + wrapperElement.type } );
}
// Don't return an empty document
if ( context.branchType === 'document' && data.length === 0 && !annotationSet ) {
return [
if ( context.branchType === 'document' && isAllInstanceOf( data, ve.dm.MetaItem ) && !annotationSet ) {
return data.concat( [
{ 'type': 'paragraph', 'internal': { 'generated': 'empty' } },
{ 'type': '/paragraph' }
];
] );
}
this.contextStack.pop();

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

@ -1283,6 +1283,22 @@ ve.dm.example.domToDataCases = {
{ 'type': '/internalList' }
]
},
'empty document with meta': {
'html': '<body><!-- comment --></body>',
'data': [
{
'type': 'alienMeta',
'attributes': {
'domElements': $( '<!-- comment -->' ).toArray()
}
},
{ 'type': '/alienMeta' },
{ 'type': 'paragraph', 'internal': { 'generated': 'empty' } },
{ 'type': '/paragraph' },
{ 'type': 'internalList' },
{ 'type': '/internalList' }
]
},
'empty document with content added by the editor': {
'html': null,
'data': [