wikimedia/mediawiki-extensions-DiscussionTools
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/DiscussionTools synced 2024-09-24 02:48:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace the closest() polyfill

Browse source 
If we can't use the native closest() due to lack of browser support,
then I'd rather have a simple loop that implements the functionality
we need, instead of a fallback to another native method with limited
browser support and experimental implementations.

Change-Id: I0bf84aa25fc398e329b533afb28317d19716d57a
This commit is contained in:
Bartosz Dziewoński 2020-03-06 17:41:50 +01:00
parent aa91832d4e
commit 2a0f53fed9
2 changed files with 9 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/dt.ui.ReplyWidget.js
View file

@ -21,7 +21,7 @@ function ReplyWidget( comment, config ) {
ReplyWidget.super.call( this, config );
this.comment = comment;
contextNode = modifier.closest( this.comment.range.endContainer, 'dl, ul, ol' );
contextNode = modifier.closestElement( this.comment.range.endContainer, [ 'dl', 'ul', 'ol' ] );
this.context = contextNode ? contextNode.nodeName.toLowerCase() : 'dl';
inputConfig = $.extend(

28
modules/modifier.js
View file

@ -2,31 +2,19 @@
'use strict';
/**
* Adapted from MDN polyfill (CC0)
* https://developer.mozilla.org/en-US/docs/Web/API/Element/closest
* Find closest ancestor element using one of the given tag names.
*
* @param {HTMLElement} el
* @param {string} selector
* @param {Node} el
* @param {string[]} tagNames
* @return {HTMLElement|null}
*/
function closest( el, selector ) {
var matches;
el = el.nodeType === Node.ELEMENT_NODE ? el : el.parentNode;
if ( Element.prototype.closest ) {
return el.closest( selector );
}
matches = Element.prototype.matches ||
Element.prototype.msMatchesSelector ||
Element.prototype.webkitMatchesSelector;
function closestElement( el, tagNames ) {
do {
if ( matches.call( el, selector ) ) {
if ( el.nodeType === Node.ELEMENT_NODE && tagNames.indexOf( el.tagName.toLowerCase() ) !== -1 ) {
return el;
}
el = el.parentNode;
} while ( el !== null && el.nodeType === 1 );
} while ( el );
return null;
}
@ -117,7 +105,7 @@ function addListItem( comment ) {
// First, we need to find a block-level parent that we can mess with.
// If we can't find a surrounding list item or paragraph (e.g. maybe we're inside a table cell
// or something), take the parent node and hope for the best.
parent = closest( target, 'li, dd, p' ) || target.parentNode;
parent = closestElement( target, [ 'li', 'dd', 'p' ] ) || target.parentNode;
while ( target.parentNode !== parent ) {
target = target.parentNode;
}
@ -252,7 +240,7 @@ function createWikitextNode( wt ) {
}
module.exports = {
closest: closest,
closestElement: closestElement,
addReplyLink: addReplyLink,
addListItem: addListItem,
removeListItem: removeListItem,