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 "Switch back to using <span> for inline images"

Browse source
This commit is contained in:
jenkins-bot 2020-12-16 01:01:24 +00:00 committed by Gerrit Code Review
parent 094a9aa044 5e170b63ca
commit 6029c3565a
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
modules/ve-mw/dm/nodes/ve.dm.MWInlineImageNode.js
View file

@ -43,9 +43,8 @@ ve.dm.MWInlineImageNode.static.preserveHtmlAttributes = function ( attribute ) {
return attributes.indexOf( attribute ) === -1;
};
// <span> is here for backwards compatibility with Parsoid content that may be
// stored in RESTBase. This is now generated as <figure-inline>. It should
// be safe to remove when verion 1.5 content is no longer acceptable.
// For a while, Parsoid switched to <figure-inline> for inline images, but
// then decided to switch back to <span> in T266143.
ve.dm.MWInlineImageNode.static.matchTagNames = [ 'span', 'figure-inline' ];
ve.dm.MWInlineImageNode.static.disallowedAnnotationTypes = [ 'link' ];
@ -56,7 +55,7 @@ ve.dm.MWInlineImageNode.static.toDataElement = function ( domElements, converter
typeofAttrs, classes, recognizedClasses, errorIndex, width, height, types,
mwDataJSON, mwData;
container = domElements[ 0 ]; // <figure-inline> or <span>
container = domElements[ 0 ]; // <span> or <figure-inline>
imgWrapper = container.children[ 0 ]; // <a> or <span>
if ( !imgWrapper ) {
// Malformed figure, alienate (T267282)
@ -139,7 +138,7 @@ ve.dm.MWInlineImageNode.static.toDataElement = function ( domElements, converter
ve.dm.MWInlineImageNode.static.toDomElements = function ( data, doc ) {
var firstChild, srcAttr,
mediaClass = data.attributes.mediaClass,
container = doc.createElement( data.attributes.tagName || 'figure-inline' ),
container = doc.createElement( data.attributes.tagName || 'span' ),
img = doc.createElement( this.typesToTags[ mediaClass ] ),
classes = [],
originalClasses = data.attributes.originalClasses;

6
modules/ve-mw/tests/dm/ve.dm.mwExample.js
View file

@ -307,11 +307,11 @@ ve.dm.mwExample.MWBlockImage = {
ve.dm.mwExample.MWInlineImage = {
html:
'<figure-inline typeof="mw:Image" class="foo mw-valign-text-top">' +
'<span typeof="mw:Image" class="foo mw-valign-text-top">' +
'<a href="./File:Wiki.png">' +
'<img resource="./File:Wiki.png" src="http://upload.wikimedia.org/wikipedia/en/b/bc/Wiki.png" height="155" width="135" alt="alt text">' +
'</a>' +
'</figure-inline>',
'</span>',
data: {
type: 'mwInlineImage',
attributes: {
@ -328,7 +328,7 @@ ve.dm.mwExample.MWInlineImage = {
type: 'none',
originalClasses: 'foo mw-valign-text-top',
unrecognizedClasses: [ 'foo' ],
tagName: 'figure-inline'
tagName: 'span'
}
},
storeItems: {