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

Merge "Fix Parsoid HTML of broken images"

Browse source
This commit is contained in:
jenkins-bot 2021-02-26 19:54:52 +00:00 committed by Gerrit Code Review
parent 0853e8515b fd3ea87352
commit 8e5af5aafd
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
modules/ve-mw/dm/nodes/ve.dm.MWBlockImageNode.js
View file

@ -168,7 +168,7 @@ ve.dm.MWBlockImageNode.static.toDomElements = function ( data, doc, converter )
mediaClass = dataElement.attributes.mediaClass, mediaClass = dataElement.attributes.mediaClass,
figure = doc.createElement( 'figure' ), figure = doc.createElement( 'figure' ),
imgWrapper = doc.createElement( dataElement.attributes.href ? 'a' : 'span' ), imgWrapper = doc.createElement( dataElement.attributes.href ? 'a' : 'span' ),
img = doc.createElement( this.typesToTags[ mediaClass ] ), img = doc.createElement( dataElement.attributes.isError ? 'span' : this.typesToTags[ mediaClass ] ),
wrapper = doc.createElement( 'div' ), wrapper = doc.createElement( 'div' ),
classAttr = this.getClassAttrFromAttributes( dataElement.attributes ), classAttr = this.getClassAttrFromAttributes( dataElement.attributes ),
captionData = data.slice( 1, -1 ); captionData = data.slice( 1, -1 );
@ -202,12 +202,14 @@ ve.dm.MWBlockImageNode.static.toDomElements = function ( data, doc, converter )
} }
srcAttr = this.typesToSrcAttrs[ mediaClass ]; srcAttr = this.typesToSrcAttrs[ mediaClass ];
if ( srcAttr ) { if ( srcAttr && !dataElement.attributes.isError ) {
img.setAttribute( srcAttr, dataElement.attributes.src ); img.setAttribute( srcAttr, dataElement.attributes.src );
} }
// TODO: This does not make sense for broken images (when img is a span node)
img.setAttribute( 'width', width ); img.setAttribute( 'width', width );
img.setAttribute( 'height', height ); img.setAttribute( 'height', height );
img.setAttribute( 'resource', dataElement.attributes.resource ); img.setAttribute( 'resource', dataElement.attributes.resource );
// TODO: This does not make sense for broken images (when img is a span node)
if ( typeof dataElement.attributes.alt === 'string' ) { if ( typeof dataElement.attributes.alt === 'string' ) {
img.setAttribute( 'alt', dataElement.attributes.alt ); img.setAttribute( 'alt', dataElement.attributes.alt );
} }

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

@ -149,16 +149,18 @@ ve.dm.MWInlineImageNode.static.toDomElements = function ( data, doc ) {
var firstChild, srcAttr, var firstChild, srcAttr,
mediaClass = data.attributes.mediaClass, mediaClass = data.attributes.mediaClass,
container = doc.createElement( data.attributes.tagName || 'span' ), container = doc.createElement( data.attributes.tagName || 'span' ),
img = doc.createElement( this.typesToTags[ mediaClass ] ), img = doc.createElement( data.attributes.isError ? 'span' : this.typesToTags[ mediaClass ] ),
classes = [], classes = [],
originalClasses = data.attributes.originalClasses; originalClasses = data.attributes.originalClasses;
// TODO: This does not make sense for broken images (when img is a span node)
ve.setDomAttributes( img, data.attributes, [ 'width', 'height', 'resource' ] ); ve.setDomAttributes( img, data.attributes, [ 'width', 'height', 'resource' ] );
srcAttr = this.typesToSrcAttrs[ mediaClass ]; srcAttr = this.typesToSrcAttrs[ mediaClass ];
if ( srcAttr ) { if ( srcAttr && !data.attributes.isError ) {
img.setAttribute( srcAttr, data.attributes.src ); img.setAttribute( srcAttr, data.attributes.src );
} }
// TODO: This does not make sense for broken images (when img is a span node)
if ( typeof data.attributes.alt === 'string' ) { if ( typeof data.attributes.alt === 'string' ) {
img.setAttribute( 'alt', data.attributes.alt ); img.setAttribute( 'alt', data.attributes.alt );
} }