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

Merge "Fix Gallery images always having |link=| and |alt=|"

Browse source
This commit is contained in:
jenkins-bot 2023-11-28 20:17:32 +00:00 committed by Gerrit Code Review
parent 876a947a7b 5db452f5fa
commit 0ec1a7a2c0
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
modules/ve-mw/dm/nodes/ve.dm.MWGalleryImageNode.js
View file

@ -230,10 +230,11 @@ ve.dm.MWGalleryImageNode.static.toDomElements = function ( data, doc, converter
while ( captionWrapper.firstChild ) { while ( captionWrapper.firstChild ) {
li.appendChild( captionWrapper.firstChild ); li.appendChild( captionWrapper.firstChild );
} }
var captionText = ve.dm.MWGalleryImageNode.static.textContentFromCaption( li ).trim();
if ( img.nodeName.toLowerCase() === 'img' ) { if ( img.nodeName.toLowerCase() === 'img' ) {
if ( attributes.altTextSame ) { if ( attributes.altTextSame && captionText ) {
img.setAttribute( 'alt', ve.dm.MWGalleryImageNode.static.textContentFromCaption( li ).trim() ); img.setAttribute( 'alt', captionText );
} else if ( typeof alt === 'string' ) { } else if ( typeof alt === 'string' ) {
img.setAttribute( 'alt', alt ); img.setAttribute( 'alt', alt );
} }

6
modules/ve-mw/ui/dialogs/ve.ui.MWGalleryDialog.js
View file

@ -671,7 +671,11 @@ ve.ui.MWGalleryDialog.prototype.onRequestImagesSuccess = function ( response ) {
resource: title, resource: title,
altText: null, altText: null,
altTextSame: true, altTextSame: true,
href: null, // TODO: support changing the link in the UI somewhere;
// for now, always link to the resource. Do it here when
// generating new results, so existing links from source
// will be preserved.
href: title,
src: '', src: '',
height: thumbUrls[ title ].height, height: thumbUrls[ title ].height,
width: thumbUrls[ title ].width, width: thumbUrls[ title ].width,