mirror of
https://gerrit.wikimedia.org/r/mediawiki/extensions/Popups
synced 2024-12-22 12:02:46 +00:00
2eeaa0a2e4
The clip-path SVG property was conditionally set in thumbnail.js and also conditionally set or removed in renderer.js. This patch refactors the logic to occur in a single place, renderer.js. The refactor was made with the following considerations: • The one condition under which thumbnail.js would set clip-path was, given a thumbnail exists, the thumbnail was not tall and clip-path would be set to `url(#mwe-popups-mask)`. Otherwise, thumbnail.js would not set clip-path. • The logic in renderer.js for setting the attribute doesn't change since overwriting the clip-path is equivalent to not having a preexisting value. The case for removing the attribute itself is replaced by inverting the condition, `flippedY`, and combining it with the thumbnail.js condition, `!isTall`. The operation is only valid for an existing thumbnail so the `hasThumbnail` remains unchanged. This patch also clarifies that the "flipped" classes are exclusively set by using an if / else chain instead of reconsidering all inputs for each condition. Bug: T190831 Change-Id: I4062ec7068dcadecbdbc4791447ea2ed1ce2a1de
145 lines
3.6 KiB
JavaScript
145 lines
3.6 KiB
JavaScript
/**
|
|
* @module thumbnail
|
|
*/
|
|
|
|
const SIZES = {
|
|
portraitImage: {
|
|
h: 250, // Exact height
|
|
w: 203 // Max width
|
|
},
|
|
landscapeImage: {
|
|
h: 200, // Max height
|
|
w: 320 // Exact Width
|
|
}
|
|
},
|
|
$ = jQuery;
|
|
|
|
export { SIZES };
|
|
|
|
/**
|
|
* @typedef {Object} ext.popups.Thumbnail
|
|
* @property {Element} el
|
|
* @property {Boolean} isTall Whether or not the thumbnail is portrait
|
|
*/
|
|
|
|
/**
|
|
* Creates a thumbnail from the representation of a thumbnail returned by the
|
|
* PageImages MediaWiki API query module.
|
|
*
|
|
* If there's no thumbnail, the thumbnail is too small, or the thumbnail's URL
|
|
* contains characters that could be used to perform an
|
|
* [XSS attack via CSS](https://www.owasp.org/index.php/Testing_for_CSS_Injection_(OTG-CLIENT-005)),
|
|
* then `null` is returned.
|
|
*
|
|
* Extracted from `mw.popups.renderer.article.createThumbnail`.
|
|
*
|
|
* @param {Object} rawThumbnail
|
|
* @return {ext.popups.Thumbnail|null}
|
|
*/
|
|
export function createThumbnail( rawThumbnail ) {
|
|
const devicePixelRatio = $.bracketedDevicePixelRatio();
|
|
|
|
if ( !rawThumbnail ) {
|
|
return null;
|
|
}
|
|
|
|
const tall = rawThumbnail.width < rawThumbnail.height;
|
|
const thumbWidth = rawThumbnail.width / devicePixelRatio;
|
|
const thumbHeight = rawThumbnail.height / devicePixelRatio;
|
|
|
|
if (
|
|
// Image too small for landscape display
|
|
( !tall && thumbWidth < SIZES.landscapeImage.w ) ||
|
|
// Image too small for portrait display
|
|
( tall && thumbHeight < SIZES.portraitImage.h ) ||
|
|
// These characters in URL that could inject CSS and thus JS
|
|
(
|
|
rawThumbnail.source.indexOf( '\\' ) > -1 ||
|
|
rawThumbnail.source.indexOf( '\'' ) > -1 ||
|
|
rawThumbnail.source.indexOf( '"' ) > -1
|
|
)
|
|
) {
|
|
return null;
|
|
}
|
|
|
|
let x, y, width, height;
|
|
if ( tall ) {
|
|
x = ( thumbWidth > SIZES.portraitImage.w ) ?
|
|
( ( thumbWidth - SIZES.portraitImage.w ) / -2 ) :
|
|
( SIZES.portraitImage.w - thumbWidth );
|
|
y = ( thumbHeight > SIZES.portraitImage.h ) ?
|
|
( ( thumbHeight - SIZES.portraitImage.h ) / -2 ) : 0;
|
|
width = SIZES.portraitImage.w;
|
|
height = SIZES.portraitImage.h;
|
|
} else {
|
|
x = 0;
|
|
y = ( thumbHeight > SIZES.landscapeImage.h ) ?
|
|
( ( thumbHeight - SIZES.landscapeImage.h ) / -2 ) : 0;
|
|
width = SIZES.landscapeImage.w + 3;
|
|
height = ( thumbHeight > SIZES.landscapeImage.h ) ?
|
|
SIZES.landscapeImage.h : thumbHeight;
|
|
}
|
|
|
|
return {
|
|
el: createThumbnailElement(
|
|
tall ? 'mwe-popups-is-tall' : 'mwe-popups-is-not-tall',
|
|
rawThumbnail.source,
|
|
x,
|
|
y,
|
|
thumbWidth,
|
|
thumbHeight,
|
|
width,
|
|
height
|
|
),
|
|
isTall: tall,
|
|
width: thumbWidth,
|
|
height: thumbHeight
|
|
};
|
|
}
|
|
|
|
/**
|
|
* Creates the SVG image element that represents the thumbnail.
|
|
*
|
|
* This function is distinct from `createThumbnail` as it abstracts away some
|
|
* browser issues that are uncovered when manipulating elements across
|
|
* namespaces.
|
|
*
|
|
* @param {String} className
|
|
* @param {String} url
|
|
* @param {Number} x
|
|
* @param {Number} y
|
|
* @param {Number} thumbnailWidth
|
|
* @param {Number} thumbnailHeight
|
|
* @param {Number} width
|
|
* @param {Number} height
|
|
* @param {String} clipPath
|
|
* @return {jQuery}
|
|
*/
|
|
export function createThumbnailElement(
|
|
className, url, x, y, thumbnailWidth, thumbnailHeight, width, height
|
|
) {
|
|
const nsSvg = 'http://www.w3.org/2000/svg',
|
|
nsXlink = 'http://www.w3.org/1999/xlink';
|
|
|
|
const $thumbnailSVGImage = $( document.createElementNS( nsSvg, 'image' ) );
|
|
$thumbnailSVGImage[ 0 ].setAttributeNS( nsXlink, 'href', url );
|
|
$thumbnailSVGImage
|
|
.addClass( className )
|
|
.attr( {
|
|
x,
|
|
y,
|
|
width: thumbnailWidth,
|
|
height: thumbnailHeight
|
|
} );
|
|
|
|
const $thumbnail = $( document.createElementNS( nsSvg, 'svg' ) )
|
|
.attr( {
|
|
xmlns: nsSvg,
|
|
width,
|
|
height
|
|
} )
|
|
.append( $thumbnailSVGImage );
|
|
|
|
return $thumbnail;
|
|
}
|