mediawiki-extensions-Popups/src/ui/renderer.js

585 lines
16 KiB
JavaScript
Raw Normal View History

/**
* @module renderer
*/
import wait from '../wait';
import pokeyMaskSVG from './pokey-mask.svg';
import { SIZES, createThumbnail } from './thumbnail';
import { previewTypes } from '../preview/model';
import { renderPreview } from './templates/preview/preview';
import { renderPagePreview } from './templates/pagePreview/pagePreview';
const mw = window.mediaWiki,
$ = jQuery,
$window = $( window ),
landscapePopupWidth = 450,
portraitPopupWidth = 320,
pokeySize = 8; // Height of the pokey.;
/**
* Extracted from `mw.popups.createSVGMasks`. This is just an SVG mask to point
* or "poke" at the link that's hovered over. The "pokey" appears to be cut out
* of the image itself:
Hygiene: consolidate CSS class manipulation • Instead of removing 'mwe-popups-no-image-tri' in renderer#layoutPreview(), add more conditions to #getClasses(). The addition condition in getClasses() was: ( !hasThumbnail || isTall ) && !flippedY The removal condition in layoutPreview() was: flippedX && !flippedY && hasThumbnail && isTall To combine them, the removal logic is inverted and the conjunction is taken: ( ( !hasThumbnail || isTall ) && !flippedY ) && !( flippedX && !flippedY && hasThumbnail && isTall ) Push the negation inwards: ( !hasThumbnail && !flippedY || isTall && !flippedY ) && ( !flippedX || flippedY || !hasThumbnail || !isTall ) Expand: !hasThumbnail && !flippedY && !flippedX || !hasThumbnail && !flippedY && flippedY || !hasThumbnail && !flippedY && !hasThumbnail || !hasThumbnail && !flippedY && !isTall || isTall && !flippedY && !flippedX || isTall && !flippedY && flippedY || isTall && !flippedY && !hasThumbnail || isTall && !flippedY && !isTall Eliminate always false conditions and combine redundancies: !hasThumbnail && !flippedY && !flippedX || !hasThumbnail && !flippedY || !hasThumbnail && !flippedY && !isTall || isTall && !flippedY && !flippedX || isTall && !flippedY && !hasThumbnail Further eliminate redundancies: !hasThumbnail && !flippedY || isTall && !flippedY && !flippedX || isTall && !flippedY && !hasThumbnail Factor: !flippedY && ( !hasThumbnail || isTall && !flippedX || isTall && !hasThumbnail ) Factor more: !flippedY && ( !hasThumbnail || isTall && ( !flippedX || !hasThumbnail ) ) Eliminate last redundancies: !flippedY && ( !hasThumbnail || isTall && !flippedX ) The getClasses() test is updated for the new logic. • Move thumbnail clip path manipulation from renderer#layoutPreview() to a new function, #setThumbnailClipPath(). The new function flips the order of the series of if statements so that an if / else block can be used instead which clarifies that clip-path state is exclusive. In other words: if ( a ) { foo.prop = 1; } if ( b ) { foo.prop = 2; } if ( c ) { foo.prop = 3; } if ( d ) { foo.prop = 4; } Can generically be refactored regardless of condition or value to: if ( d ) { foo.prop = 4; } else if ( c ) { foo.prop = 3; } else if ( b ) { foo.prop = 2; } else if ( a ) { foo.prop = 1; } Because prop was originally overwritten which implies if / else-like priority. Additionally: • The entire function call is wrapped in a hasThumbnail conditional which previously was checked as an input in each case. • Consolidate the last two conditions since they only differed by a single boolean input. • Move the setAttribute() action to the end of the function since the conditionals just map condition to value and the action is now identical. • Revise pokey mask doc to use clip-path terminology. This inverts the thinking about the mask but better matches usage. Bug: T190831 Change-Id: Ib460c6c07fcb054f8d425d127c588bb28a1d2473
2018-04-13 17:29:57 +00:00
* _______ link
* | | _/\_____ _/\____ <-- Pokey pointing at link
* | :-] | + |xxxxxxx = | :-] |
* |_______| |xxxxxxx |_______|
* :
* Thumbnail Pokey Page preview
* image clip-path bubble w/ pokey
*
* SVG masks are used in place of CSS masks for browser support issues (see
* https://caniuse.com/#feat=css-masks).
*
* @private
* @param {Object} container DOM object to which pokey masks are appended
*/
export function createPokeyMasks( container ) {
$( '<div>' )
.attr( 'id', 'mwe-popups-svg' )
.html( pokeyMaskSVG )
.appendTo( container );
}
/**
* Initializes the renderer.
*/
export function init() {
createPokeyMasks( document.body );
}
/**
* The model of how a view is rendered, which is constructed from a response
* from the gateway.
*
* TODO: Rename `isTall` to `isPortrait`.
*
* @typedef {Object} ext.popups.Preview
* @property {jQuery} el
* @property {Boolean} hasThumbnail
* @property {Object} thumbnail
* @property {Boolean} isTall Sugar around
* `preview.hasThumbnail && thumbnail.isTall`
*/
/**
* Renders a preview given data from the {@link gateway Gateway}.
* The preview is rendered and added to the DOM but will remain hidden until
* the `show` method is called.
*
* Previews are rendered at:
*
* # The position of the mouse when the user dwells on the link with their
* mouse.
* # The centermost point of the link when the user dwells on the link with
* their keyboard or other assistive device.
*
* Since the content of the preview doesn't change but its position might, we
* distinguish between "rendering" - generating HTML from a MediaWiki API
* response - and "showing/hiding" - positioning the layout and changing its
* orientation, if necessary.
*
* @param {ext.popups.PreviewModel} model
* @return {ext.popups.Preview}
*/
export function render( model ) {
const preview = createPreviewWithType( model );
return {
/**
* Shows the preview given an event representing the user's interaction
* with the active link, e.g. an instance of
* [MouseEvent](https://developer.mozilla.org/en/docs/Web/API/MouseEvent).
*
* See `show` for more detail.
*
* @param {Event} event
* @param {Object} boundActions The
* [bound action creators](http://redux.js.org/docs/api/bindActionCreators.html)
* that were (likely) created in [boot.js](./boot.js).
* @param {String} token The unique token representing the link interaction
* that resulted in showing the preview
* @return {jQuery.Promise}
*/
show( event, boundActions, token ) {
return show(
preview, event, $( event.target ), boundActions, token,
document.body
);
},
/**
* Hides the preview.
*
* See `hide` for more detail.
*
* @return {jQuery.Promise}
*/
hide() {
return hide( preview );
}
};
}
/**
* Creates an instance of a Preview based on
* the type property of the PreviewModel
*
* @param {ext.popups.PreviewModel} model
* @return {ext.popups.Preview}
*/
export function createPreviewWithType( model ) {
switch ( model.type ) {
case previewTypes.TYPE_PAGE:
return createPagePreview( model );
case previewTypes.TYPE_DISAMBIGUATION:
return createDisambiguationPreview( model );
default:
return createEmptyPreview( model );
}
}
/**
* Creates an instance of the DTO backing a preview.
*
* @param {ext.popups.PreviewModel} model
* @return {ext.popups.Preview}
*/
export function createPagePreview( model ) {
const thumbnail = createThumbnail( model.thumbnail ),
hasThumbnail = thumbnail !== null,
extract = model.extract;
const $el = $( $.parseHTML( renderPagePreview( model, hasThumbnail ) ) );
if ( hasThumbnail ) {
$el.find( '.mwe-popups-discreet' ).append( thumbnail.el );
}
if ( extract ) {
$el.find( '.mwe-popups-extract' ).append( extract );
}
return {
el: $el,
hasThumbnail,
thumbnail,
isTall: hasThumbnail && thumbnail.isTall
};
}
/**
* Creates an instance of the DTO backing a preview. In this case the DTO
* represents a generic preview, which covers the following scenarios:
*
* * The page doesn't exist, i.e. the user hovered over a redlink or a
* redirect to a page that doesn't exist.
* * The page doesn't have a viable extract.
*
* @param {ext.popups.PreviewModel} model
* @return {ext.popups.Preview}
*/
export function createEmptyPreview( model ) {
const showTitle = false,
extractMsg = mw.msg( 'popups-preview-no-preview' ),
linkMsg = mw.msg( 'popups-preview-footer-read' );
const $el = $(
$.parseHTML( renderPreview( model, showTitle, extractMsg, linkMsg ) )
);
return {
el: $el,
hasThumbnail: false,
isTall: false
};
}
/**
* Creates an instance of the disambiguation preview.
*
* @param {ext.popups.PreviewModel} model
* @return {ext.popups.Preview}
*/
export function createDisambiguationPreview( model ) {
const showTitle = true,
extractMsg = mw.msg( 'popups-preview-disambiguation' ),
linkMsg = mw.msg( 'popups-preview-disambiguation-link' );
const $el = $(
$.parseHTML( renderPreview( model, showTitle, extractMsg, linkMsg ) )
);
return {
el: $el,
hasThumbnail: false,
isTall: false
};
}
/**
* Shows the preview.
*
* Extracted from `mw.popups.render.openPopup`.
*
* TODO: From the perspective of the client, there's no need to distinguish
* between rendering and showing a preview. Merge #render and Preview#show.
*
* @param {ext.popups.Preview} preview
* @param {Event} event
* @param {jQuery} $link event target
* @param {ext.popups.PreviewBehavior} behavior
* @param {String} token
* @param {Object} container DOM object to which pokey masks are appended
* @return {jQuery.Promise} A promise that resolves when the promise has faded
* in
*/
export function show( preview, event, $link, behavior,
token, container
) {
const layout = createLayout(
preview.isTall,
{
pageX: event.pageX,
pageY: event.pageY,
clientY: event.clientY
},
{
clientRects: $link.get( 0 ).getClientRects(),
offset: $link.offset(),
width: $link.width(),
height: $link.height()
},
{
scrollTop: $window.scrollTop(),
width: $window.width(),
height: $window.height()
},
pokeySize
);
preview.el.appendTo( container );
layoutPreview(
preview, layout, getClasses( preview, layout ),
SIZES.landscapeImage.h, pokeySize
);
preview.el.show();
return wait( 200 )
.then( () => {
bindBehavior( preview, behavior );
} )
.then( () => {
behavior.previewShow( token );
} );
}
/**
* Binds the behavior to the interactive elements of the preview.
*
* @param {ext.popups.Preview} preview
* @param {ext.popups.PreviewBehavior} behavior
*/
export function bindBehavior( preview, behavior ) {
preview.el.on( 'mouseenter', behavior.previewDwell )
.on( 'mouseleave', behavior.previewAbandon );
preview.el.click( behavior.click );
preview.el.find( '.mwe-popups-settings-icon' )
.attr( 'href', behavior.settingsUrl )
.click( ( event ) => {
event.stopPropagation();
behavior.showSettings( event );
} );
}
/**
* Extracted from `mw.popups.render.closePopup`.
*
* @param {ext.popups.Preview} preview
* @return {jQuery.Promise} A promise that resolves when the preview has faded
* out
*/
export function hide( preview ) {
// FIXME: This method clearly needs access to the layout of the preview.
const fadeInClass = ( preview.el.hasClass( 'mwe-popups-fade-in-up' ) ) ?
'mwe-popups-fade-in-up' :
'mwe-popups-fade-in-down';
const fadeOutClass = ( fadeInClass === 'mwe-popups-fade-in-up' ) ?
'mwe-popups-fade-out-down' :
'mwe-popups-fade-out-up';
preview.el
.removeClass( fadeInClass )
.addClass( fadeOutClass );
return wait( 150 ).then( () => {
preview.el.remove();
} );
}
/**
* Represents the layout of a preview, which consists of a position (`offset`)
* and whether or not the preview should be flipped horizontally or
* vertically (`flippedX` and `flippedY` respectively).
*
* @typedef {Object} ext.popups.PreviewLayout
* @property {Object} offset
* @property {number} offset.top
* @property {number} offset.left
* @property {Boolean} flippedX
* @property {Boolean} flippedY
*/
/**
* @param {Boolean} isPreviewTall
* @param {Object} eventData Data related to the event that triggered showing
* a popup
* @param {number} eventData.pageX
* @param {number} eventData.pageY
* @param {number} eventData.clientY
* @param {Object} linkData Data related to the link thats used for showing
* a popup
* @param {ClientRectList} linkData.clientRects list of rectangles defined by
* four edges
* @param {Object} linkData.offset
* @param {number} linkData.width
* @param {number} linkData.height
* @param {Object} windowData Data related to the window
* @param {number} windowData.scrollTop
* @param {number} windowData.width
* @param {number} windowData.height
* @param {number} pokeySize Space reserved for the pokey
* @return {ext.popups.PreviewLayout}
*/
export function createLayout(
isPreviewTall, eventData, linkData, windowData, pokeySize
) {
let flippedX = false,
flippedY = false,
offsetTop = eventData.pageY ?
// If it was a mouse event, position according to mouse
// Since client rectangles are relative to the viewport,
// take scroll position into account.
getClosestYPosition(
eventData.pageY - windowData.scrollTop,
linkData.clientRects,
false
) + windowData.scrollTop + pokeySize :
// Position according to link position or size
linkData.offset.top + linkData.height + pokeySize,
offsetLeft = eventData.pageX ? eventData.pageX : linkData.offset.left;
const clientTop = eventData.clientY ? eventData.clientY : offsetTop;
// X Flip
if ( offsetLeft > ( windowData.width / 2 ) ) {
offsetLeft += ( !eventData.pageX ) ? linkData.width : 0;
offsetLeft -= !isPreviewTall ?
portraitPopupWidth :
landscapePopupWidth;
flippedX = true;
}
if ( eventData.pageX ) {
offsetLeft += ( flippedX ) ? 20 : -20;
}
// Y Flip
if ( clientTop > ( windowData.height / 2 ) ) {
flippedY = true;
// Mirror the positioning of the preview when there's no "Y flip": rest
// the pokey on the edge of the link's bounding rectangle. In this case
// the edge is the top-most.
offsetTop = linkData.offset.top;
// Change the Y position to the top of the link
if ( eventData.pageY ) {
// Since client rectangles are relative to the viewport,
// take scroll position into account.
offsetTop = getClosestYPosition(
eventData.pageY - windowData.scrollTop,
linkData.clientRects,
true
) + windowData.scrollTop;
}
offsetTop -= pokeySize;
}
return {
offset: {
top: offsetTop,
left: offsetLeft
},
flippedX,
flippedY
};
}
/**
* Generates a list of declarative CSS classes that represent the layout of
* the preview.
*
* @param {ext.popups.Preview} preview
* @param {ext.popups.PreviewLayout} layout
* @return {String[]}
*/
export function getClasses( preview, layout ) {
const classes = [];
if ( layout.flippedY ) {
classes.push( 'mwe-popups-fade-in-down' );
} else {
classes.push( 'mwe-popups-fade-in-up' );
}
if ( layout.flippedY && layout.flippedX ) {
classes.push( 'flipped_x_y' );
} else if ( layout.flippedY ) {
classes.push( 'flipped_y' );
} else if ( layout.flippedX ) {
classes.push( 'flipped_x' );
}
Hygiene: consolidate CSS class manipulation • Instead of removing 'mwe-popups-no-image-tri' in renderer#layoutPreview(), add more conditions to #getClasses(). The addition condition in getClasses() was: ( !hasThumbnail || isTall ) && !flippedY The removal condition in layoutPreview() was: flippedX && !flippedY && hasThumbnail && isTall To combine them, the removal logic is inverted and the conjunction is taken: ( ( !hasThumbnail || isTall ) && !flippedY ) && !( flippedX && !flippedY && hasThumbnail && isTall ) Push the negation inwards: ( !hasThumbnail && !flippedY || isTall && !flippedY ) && ( !flippedX || flippedY || !hasThumbnail || !isTall ) Expand: !hasThumbnail && !flippedY && !flippedX || !hasThumbnail && !flippedY && flippedY || !hasThumbnail && !flippedY && !hasThumbnail || !hasThumbnail && !flippedY && !isTall || isTall && !flippedY && !flippedX || isTall && !flippedY && flippedY || isTall && !flippedY && !hasThumbnail || isTall && !flippedY && !isTall Eliminate always false conditions and combine redundancies: !hasThumbnail && !flippedY && !flippedX || !hasThumbnail && !flippedY || !hasThumbnail && !flippedY && !isTall || isTall && !flippedY && !flippedX || isTall && !flippedY && !hasThumbnail Further eliminate redundancies: !hasThumbnail && !flippedY || isTall && !flippedY && !flippedX || isTall && !flippedY && !hasThumbnail Factor: !flippedY && ( !hasThumbnail || isTall && !flippedX || isTall && !hasThumbnail ) Factor more: !flippedY && ( !hasThumbnail || isTall && ( !flippedX || !hasThumbnail ) ) Eliminate last redundancies: !flippedY && ( !hasThumbnail || isTall && !flippedX ) The getClasses() test is updated for the new logic. • Move thumbnail clip path manipulation from renderer#layoutPreview() to a new function, #setThumbnailClipPath(). The new function flips the order of the series of if statements so that an if / else block can be used instead which clarifies that clip-path state is exclusive. In other words: if ( a ) { foo.prop = 1; } if ( b ) { foo.prop = 2; } if ( c ) { foo.prop = 3; } if ( d ) { foo.prop = 4; } Can generically be refactored regardless of condition or value to: if ( d ) { foo.prop = 4; } else if ( c ) { foo.prop = 3; } else if ( b ) { foo.prop = 2; } else if ( a ) { foo.prop = 1; } Because prop was originally overwritten which implies if / else-like priority. Additionally: • The entire function call is wrapped in a hasThumbnail conditional which previously was checked as an input in each case. • Consolidate the last two conditions since they only differed by a single boolean input. • Move the setAttribute() action to the end of the function since the conditionals just map condition to value and the action is now identical. • Revise pokey mask doc to use clip-path terminology. This inverts the thinking about the mask but better matches usage. Bug: T190831 Change-Id: Ib460c6c07fcb054f8d425d127c588bb28a1d2473
2018-04-13 17:29:57 +00:00
if ( ( !preview.hasThumbnail || preview.isTall && !layout.flippedX ) &&
!layout.flippedY ) {
classes.push( 'mwe-popups-no-image-tri' );
}
if ( ( preview.hasThumbnail && !preview.isTall ) && !layout.flippedY ) {
classes.push( 'mwe-popups-image-tri' );
}
if ( preview.isTall ) {
classes.push( 'mwe-popups-is-tall' );
} else {
classes.push( 'mwe-popups-is-not-tall' );
}
return classes;
}
/**
* Lays out the preview given the layout.
*
* If the thumbnail is landscape and isn't the full height of the thumbnail
* container, then pull the extract up to keep whitespace consistent across
* previews.
*
* @param {ext.popups.Preview} preview
* @param {ext.popups.PreviewLayout} layout
* @param {string[]} classes class names used for layout out the preview
* @param {number} predefinedLandscapeImageHeight landscape image height
* @param {number} pokeySize
Hygiene: consolidate CSS class manipulation • Instead of removing 'mwe-popups-no-image-tri' in renderer#layoutPreview(), add more conditions to #getClasses(). The addition condition in getClasses() was: ( !hasThumbnail || isTall ) && !flippedY The removal condition in layoutPreview() was: flippedX && !flippedY && hasThumbnail && isTall To combine them, the removal logic is inverted and the conjunction is taken: ( ( !hasThumbnail || isTall ) && !flippedY ) && !( flippedX && !flippedY && hasThumbnail && isTall ) Push the negation inwards: ( !hasThumbnail && !flippedY || isTall && !flippedY ) && ( !flippedX || flippedY || !hasThumbnail || !isTall ) Expand: !hasThumbnail && !flippedY && !flippedX || !hasThumbnail && !flippedY && flippedY || !hasThumbnail && !flippedY && !hasThumbnail || !hasThumbnail && !flippedY && !isTall || isTall && !flippedY && !flippedX || isTall && !flippedY && flippedY || isTall && !flippedY && !hasThumbnail || isTall && !flippedY && !isTall Eliminate always false conditions and combine redundancies: !hasThumbnail && !flippedY && !flippedX || !hasThumbnail && !flippedY || !hasThumbnail && !flippedY && !isTall || isTall && !flippedY && !flippedX || isTall && !flippedY && !hasThumbnail Further eliminate redundancies: !hasThumbnail && !flippedY || isTall && !flippedY && !flippedX || isTall && !flippedY && !hasThumbnail Factor: !flippedY && ( !hasThumbnail || isTall && !flippedX || isTall && !hasThumbnail ) Factor more: !flippedY && ( !hasThumbnail || isTall && ( !flippedX || !hasThumbnail ) ) Eliminate last redundancies: !flippedY && ( !hasThumbnail || isTall && !flippedX ) The getClasses() test is updated for the new logic. • Move thumbnail clip path manipulation from renderer#layoutPreview() to a new function, #setThumbnailClipPath(). The new function flips the order of the series of if statements so that an if / else block can be used instead which clarifies that clip-path state is exclusive. In other words: if ( a ) { foo.prop = 1; } if ( b ) { foo.prop = 2; } if ( c ) { foo.prop = 3; } if ( d ) { foo.prop = 4; } Can generically be refactored regardless of condition or value to: if ( d ) { foo.prop = 4; } else if ( c ) { foo.prop = 3; } else if ( b ) { foo.prop = 2; } else if ( a ) { foo.prop = 1; } Because prop was originally overwritten which implies if / else-like priority. Additionally: • The entire function call is wrapped in a hasThumbnail conditional which previously was checked as an input in each case. • Consolidate the last two conditions since they only differed by a single boolean input. • Move the setAttribute() action to the end of the function since the conditionals just map condition to value and the action is now identical. • Revise pokey mask doc to use clip-path terminology. This inverts the thinking about the mask but better matches usage. Bug: T190831 Change-Id: Ib460c6c07fcb054f8d425d127c588bb28a1d2473
2018-04-13 17:29:57 +00:00
* @return {void}
*/
export function layoutPreview(
preview, layout, classes, predefinedLandscapeImageHeight, pokeySize
) {
const popup = preview.el,
isTall = preview.isTall,
hasThumbnail = preview.hasThumbnail,
thumbnail = preview.thumbnail,
Hygiene: consolidate CSS class manipulation • Instead of removing 'mwe-popups-no-image-tri' in renderer#layoutPreview(), add more conditions to #getClasses(). The addition condition in getClasses() was: ( !hasThumbnail || isTall ) && !flippedY The removal condition in layoutPreview() was: flippedX && !flippedY && hasThumbnail && isTall To combine them, the removal logic is inverted and the conjunction is taken: ( ( !hasThumbnail || isTall ) && !flippedY ) && !( flippedX && !flippedY && hasThumbnail && isTall ) Push the negation inwards: ( !hasThumbnail && !flippedY || isTall && !flippedY ) && ( !flippedX || flippedY || !hasThumbnail || !isTall ) Expand: !hasThumbnail && !flippedY && !flippedX || !hasThumbnail && !flippedY && flippedY || !hasThumbnail && !flippedY && !hasThumbnail || !hasThumbnail && !flippedY && !isTall || isTall && !flippedY && !flippedX || isTall && !flippedY && flippedY || isTall && !flippedY && !hasThumbnail || isTall && !flippedY && !isTall Eliminate always false conditions and combine redundancies: !hasThumbnail && !flippedY && !flippedX || !hasThumbnail && !flippedY || !hasThumbnail && !flippedY && !isTall || isTall && !flippedY && !flippedX || isTall && !flippedY && !hasThumbnail Further eliminate redundancies: !hasThumbnail && !flippedY || isTall && !flippedY && !flippedX || isTall && !flippedY && !hasThumbnail Factor: !flippedY && ( !hasThumbnail || isTall && !flippedX || isTall && !hasThumbnail ) Factor more: !flippedY && ( !hasThumbnail || isTall && ( !flippedX || !hasThumbnail ) ) Eliminate last redundancies: !flippedY && ( !hasThumbnail || isTall && !flippedX ) The getClasses() test is updated for the new logic. • Move thumbnail clip path manipulation from renderer#layoutPreview() to a new function, #setThumbnailClipPath(). The new function flips the order of the series of if statements so that an if / else block can be used instead which clarifies that clip-path state is exclusive. In other words: if ( a ) { foo.prop = 1; } if ( b ) { foo.prop = 2; } if ( c ) { foo.prop = 3; } if ( d ) { foo.prop = 4; } Can generically be refactored regardless of condition or value to: if ( d ) { foo.prop = 4; } else if ( c ) { foo.prop = 3; } else if ( b ) { foo.prop = 2; } else if ( a ) { foo.prop = 1; } Because prop was originally overwritten which implies if / else-like priority. Additionally: • The entire function call is wrapped in a hasThumbnail conditional which previously was checked as an input in each case. • Consolidate the last two conditions since they only differed by a single boolean input. • Move the setAttribute() action to the end of the function since the conditionals just map condition to value and the action is now identical. • Revise pokey mask doc to use clip-path terminology. This inverts the thinking about the mask but better matches usage. Bug: T190831 Change-Id: Ib460c6c07fcb054f8d425d127c588bb28a1d2473
2018-04-13 17:29:57 +00:00
flippedY = layout.flippedY;
let offsetTop = layout.offset.top;
if (
!flippedY && !isTall && hasThumbnail &&
thumbnail.height < predefinedLandscapeImageHeight
) {
popup.find( '.mwe-popups-extract' ).css(
'margin-top',
thumbnail.height - pokeySize
);
}
popup.addClass( classes.join( ' ' ) );
if ( flippedY ) {
offsetTop -= popup.outerHeight();
}
popup.css( {
top: offsetTop,
left: `${ layout.offset.left }px`
} );
Hygiene: consolidate CSS class manipulation • Instead of removing 'mwe-popups-no-image-tri' in renderer#layoutPreview(), add more conditions to #getClasses(). The addition condition in getClasses() was: ( !hasThumbnail || isTall ) && !flippedY The removal condition in layoutPreview() was: flippedX && !flippedY && hasThumbnail && isTall To combine them, the removal logic is inverted and the conjunction is taken: ( ( !hasThumbnail || isTall ) && !flippedY ) && !( flippedX && !flippedY && hasThumbnail && isTall ) Push the negation inwards: ( !hasThumbnail && !flippedY || isTall && !flippedY ) && ( !flippedX || flippedY || !hasThumbnail || !isTall ) Expand: !hasThumbnail && !flippedY && !flippedX || !hasThumbnail && !flippedY && flippedY || !hasThumbnail && !flippedY && !hasThumbnail || !hasThumbnail && !flippedY && !isTall || isTall && !flippedY && !flippedX || isTall && !flippedY && flippedY || isTall && !flippedY && !hasThumbnail || isTall && !flippedY && !isTall Eliminate always false conditions and combine redundancies: !hasThumbnail && !flippedY && !flippedX || !hasThumbnail && !flippedY || !hasThumbnail && !flippedY && !isTall || isTall && !flippedY && !flippedX || isTall && !flippedY && !hasThumbnail Further eliminate redundancies: !hasThumbnail && !flippedY || isTall && !flippedY && !flippedX || isTall && !flippedY && !hasThumbnail Factor: !flippedY && ( !hasThumbnail || isTall && !flippedX || isTall && !hasThumbnail ) Factor more: !flippedY && ( !hasThumbnail || isTall && ( !flippedX || !hasThumbnail ) ) Eliminate last redundancies: !flippedY && ( !hasThumbnail || isTall && !flippedX ) The getClasses() test is updated for the new logic. • Move thumbnail clip path manipulation from renderer#layoutPreview() to a new function, #setThumbnailClipPath(). The new function flips the order of the series of if statements so that an if / else block can be used instead which clarifies that clip-path state is exclusive. In other words: if ( a ) { foo.prop = 1; } if ( b ) { foo.prop = 2; } if ( c ) { foo.prop = 3; } if ( d ) { foo.prop = 4; } Can generically be refactored regardless of condition or value to: if ( d ) { foo.prop = 4; } else if ( c ) { foo.prop = 3; } else if ( b ) { foo.prop = 2; } else if ( a ) { foo.prop = 1; } Because prop was originally overwritten which implies if / else-like priority. Additionally: • The entire function call is wrapped in a hasThumbnail conditional which previously was checked as an input in each case. • Consolidate the last two conditions since they only differed by a single boolean input. • Move the setAttribute() action to the end of the function since the conditionals just map condition to value and the action is now identical. • Revise pokey mask doc to use clip-path terminology. This inverts the thinking about the mask but better matches usage. Bug: T190831 Change-Id: Ib460c6c07fcb054f8d425d127c588bb28a1d2473
2018-04-13 17:29:57 +00:00
if ( hasThumbnail ) {
setThumbnailClipPath( preview, layout );
}
Hygiene: consolidate CSS class manipulation • Instead of removing 'mwe-popups-no-image-tri' in renderer#layoutPreview(), add more conditions to #getClasses(). The addition condition in getClasses() was: ( !hasThumbnail || isTall ) && !flippedY The removal condition in layoutPreview() was: flippedX && !flippedY && hasThumbnail && isTall To combine them, the removal logic is inverted and the conjunction is taken: ( ( !hasThumbnail || isTall ) && !flippedY ) && !( flippedX && !flippedY && hasThumbnail && isTall ) Push the negation inwards: ( !hasThumbnail && !flippedY || isTall && !flippedY ) && ( !flippedX || flippedY || !hasThumbnail || !isTall ) Expand: !hasThumbnail && !flippedY && !flippedX || !hasThumbnail && !flippedY && flippedY || !hasThumbnail && !flippedY && !hasThumbnail || !hasThumbnail && !flippedY && !isTall || isTall && !flippedY && !flippedX || isTall && !flippedY && flippedY || isTall && !flippedY && !hasThumbnail || isTall && !flippedY && !isTall Eliminate always false conditions and combine redundancies: !hasThumbnail && !flippedY && !flippedX || !hasThumbnail && !flippedY || !hasThumbnail && !flippedY && !isTall || isTall && !flippedY && !flippedX || isTall && !flippedY && !hasThumbnail Further eliminate redundancies: !hasThumbnail && !flippedY || isTall && !flippedY && !flippedX || isTall && !flippedY && !hasThumbnail Factor: !flippedY && ( !hasThumbnail || isTall && !flippedX || isTall && !hasThumbnail ) Factor more: !flippedY && ( !hasThumbnail || isTall && ( !flippedX || !hasThumbnail ) ) Eliminate last redundancies: !flippedY && ( !hasThumbnail || isTall && !flippedX ) The getClasses() test is updated for the new logic. • Move thumbnail clip path manipulation from renderer#layoutPreview() to a new function, #setThumbnailClipPath(). The new function flips the order of the series of if statements so that an if / else block can be used instead which clarifies that clip-path state is exclusive. In other words: if ( a ) { foo.prop = 1; } if ( b ) { foo.prop = 2; } if ( c ) { foo.prop = 3; } if ( d ) { foo.prop = 4; } Can generically be refactored regardless of condition or value to: if ( d ) { foo.prop = 4; } else if ( c ) { foo.prop = 3; } else if ( b ) { foo.prop = 2; } else if ( a ) { foo.prop = 1; } Because prop was originally overwritten which implies if / else-like priority. Additionally: • The entire function call is wrapped in a hasThumbnail conditional which previously was checked as an input in each case. • Consolidate the last two conditions since they only differed by a single boolean input. • Move the setAttribute() action to the end of the function since the conditionals just map condition to value and the action is now identical. • Revise pokey mask doc to use clip-path terminology. This inverts the thinking about the mask but better matches usage. Bug: T190831 Change-Id: Ib460c6c07fcb054f8d425d127c588bb28a1d2473
2018-04-13 17:29:57 +00:00
}
Hygiene: consolidate CSS class manipulation • Instead of removing 'mwe-popups-no-image-tri' in renderer#layoutPreview(), add more conditions to #getClasses(). The addition condition in getClasses() was: ( !hasThumbnail || isTall ) && !flippedY The removal condition in layoutPreview() was: flippedX && !flippedY && hasThumbnail && isTall To combine them, the removal logic is inverted and the conjunction is taken: ( ( !hasThumbnail || isTall ) && !flippedY ) && !( flippedX && !flippedY && hasThumbnail && isTall ) Push the negation inwards: ( !hasThumbnail && !flippedY || isTall && !flippedY ) && ( !flippedX || flippedY || !hasThumbnail || !isTall ) Expand: !hasThumbnail && !flippedY && !flippedX || !hasThumbnail && !flippedY && flippedY || !hasThumbnail && !flippedY && !hasThumbnail || !hasThumbnail && !flippedY && !isTall || isTall && !flippedY && !flippedX || isTall && !flippedY && flippedY || isTall && !flippedY && !hasThumbnail || isTall && !flippedY && !isTall Eliminate always false conditions and combine redundancies: !hasThumbnail && !flippedY && !flippedX || !hasThumbnail && !flippedY || !hasThumbnail && !flippedY && !isTall || isTall && !flippedY && !flippedX || isTall && !flippedY && !hasThumbnail Further eliminate redundancies: !hasThumbnail && !flippedY || isTall && !flippedY && !flippedX || isTall && !flippedY && !hasThumbnail Factor: !flippedY && ( !hasThumbnail || isTall && !flippedX || isTall && !hasThumbnail ) Factor more: !flippedY && ( !hasThumbnail || isTall && ( !flippedX || !hasThumbnail ) ) Eliminate last redundancies: !flippedY && ( !hasThumbnail || isTall && !flippedX ) The getClasses() test is updated for the new logic. • Move thumbnail clip path manipulation from renderer#layoutPreview() to a new function, #setThumbnailClipPath(). The new function flips the order of the series of if statements so that an if / else block can be used instead which clarifies that clip-path state is exclusive. In other words: if ( a ) { foo.prop = 1; } if ( b ) { foo.prop = 2; } if ( c ) { foo.prop = 3; } if ( d ) { foo.prop = 4; } Can generically be refactored regardless of condition or value to: if ( d ) { foo.prop = 4; } else if ( c ) { foo.prop = 3; } else if ( b ) { foo.prop = 2; } else if ( a ) { foo.prop = 1; } Because prop was originally overwritten which implies if / else-like priority. Additionally: • The entire function call is wrapped in a hasThumbnail conditional which previously was checked as an input in each case. • Consolidate the last two conditions since they only differed by a single boolean input. • Move the setAttribute() action to the end of the function since the conditionals just map condition to value and the action is now identical. • Revise pokey mask doc to use clip-path terminology. This inverts the thinking about the mask but better matches usage. Bug: T190831 Change-Id: Ib460c6c07fcb054f8d425d127c588bb28a1d2473
2018-04-13 17:29:57 +00:00
/**
* Sets the thumbnail SVG clip-path.
*
* If the preview should be oriented differently, then the pokey is updated,
* e.g. if the preview should be flipped vertically, then the pokey is
* removed.
*
* Note: SVG clip-paths are supported everywhere but clip-paths as CSS
* properties are not. https://caniuse.com/#feat=css-clip-path
*
* @param {ext.popups.Preview} preview
* @param {ext.popups.PreviewLayout} layout
* @return {void}
*/
function setThumbnailClipPath( { el, isTall }, { flippedY, flippedX } ) {
let mask;
if ( flippedX && !flippedY ) {
mask = isTall ? 'landscape-mask' : 'mask-flip';
} else if ( flippedY && flippedX && isTall ) {
mask = 'landscape-mask-flip';
} else if ( !flippedY && !isTall ) {
mask = 'mask';
}
Hygiene: consolidate CSS class manipulation • Instead of removing 'mwe-popups-no-image-tri' in renderer#layoutPreview(), add more conditions to #getClasses(). The addition condition in getClasses() was: ( !hasThumbnail || isTall ) && !flippedY The removal condition in layoutPreview() was: flippedX && !flippedY && hasThumbnail && isTall To combine them, the removal logic is inverted and the conjunction is taken: ( ( !hasThumbnail || isTall ) && !flippedY ) && !( flippedX && !flippedY && hasThumbnail && isTall ) Push the negation inwards: ( !hasThumbnail && !flippedY || isTall && !flippedY ) && ( !flippedX || flippedY || !hasThumbnail || !isTall ) Expand: !hasThumbnail && !flippedY && !flippedX || !hasThumbnail && !flippedY && flippedY || !hasThumbnail && !flippedY && !hasThumbnail || !hasThumbnail && !flippedY && !isTall || isTall && !flippedY && !flippedX || isTall && !flippedY && flippedY || isTall && !flippedY && !hasThumbnail || isTall && !flippedY && !isTall Eliminate always false conditions and combine redundancies: !hasThumbnail && !flippedY && !flippedX || !hasThumbnail && !flippedY || !hasThumbnail && !flippedY && !isTall || isTall && !flippedY && !flippedX || isTall && !flippedY && !hasThumbnail Further eliminate redundancies: !hasThumbnail && !flippedY || isTall && !flippedY && !flippedX || isTall && !flippedY && !hasThumbnail Factor: !flippedY && ( !hasThumbnail || isTall && !flippedX || isTall && !hasThumbnail ) Factor more: !flippedY && ( !hasThumbnail || isTall && ( !flippedX || !hasThumbnail ) ) Eliminate last redundancies: !flippedY && ( !hasThumbnail || isTall && !flippedX ) The getClasses() test is updated for the new logic. • Move thumbnail clip path manipulation from renderer#layoutPreview() to a new function, #setThumbnailClipPath(). The new function flips the order of the series of if statements so that an if / else block can be used instead which clarifies that clip-path state is exclusive. In other words: if ( a ) { foo.prop = 1; } if ( b ) { foo.prop = 2; } if ( c ) { foo.prop = 3; } if ( d ) { foo.prop = 4; } Can generically be refactored regardless of condition or value to: if ( d ) { foo.prop = 4; } else if ( c ) { foo.prop = 3; } else if ( b ) { foo.prop = 2; } else if ( a ) { foo.prop = 1; } Because prop was originally overwritten which implies if / else-like priority. Additionally: • The entire function call is wrapped in a hasThumbnail conditional which previously was checked as an input in each case. • Consolidate the last two conditions since they only differed by a single boolean input. • Move the setAttribute() action to the end of the function since the conditionals just map condition to value and the action is now identical. • Revise pokey mask doc to use clip-path terminology. This inverts the thinking about the mask but better matches usage. Bug: T190831 Change-Id: Ib460c6c07fcb054f8d425d127c588bb28a1d2473
2018-04-13 17:29:57 +00:00
if ( mask ) {
el.find( 'image' )[ 0 ]
.setAttribute( 'clip-path', `url(#mwe-popups-${mask})` );
}
}
/**
* Given the rectangular box(es) find the 'y' boundary of the closest
* rectangle to the point 'y'. The point 'y' is the location of the mouse
* on the 'y' axis and the rectangular box(es) are the borders of the
* element over which the mouse is located. There will be more than one
* rectangle in case the element spans multiple lines.
*
* In the majority of cases the mouse pointer will be inside a rectangle.
* However, some browsers (i.e. Chrome) trigger a hover action even when
* the mouse pointer is just outside a bounding rectangle. That's why
* we need to look at all rectangles and not just the rectangle that
* encloses the point.
*
* @private
* @param {Number} y the point for which the closest location is being
* looked for
* @param {ClientRectList} rects list of rectangles defined by four edges
* @param {Boolean} [isTop] should the resulting rectangle's top 'y'
* boundary be returned. By default the bottom 'y' value is returned.
* @return {Number}
*/
export function getClosestYPosition( y, rects, isTop ) {
let minY = null, result;
Array.prototype.slice.call( rects ).forEach( rect => {
const deltaY = Math.abs( y - rect.top + y - rect.bottom );
if ( minY === null || minY > deltaY ) {
minY = deltaY;
// Make sure the resulting point is at or outside the rectangle
// boundaries.
result = ( isTop ) ? Math.floor( rect.top ) : Math.ceil( rect.bottom );
}
} );
return result;
}