wikimedia/mediawiki-skins-Vector
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/skins/Vector.git synced 2024-11-13 17:57:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix issues with addPortlet handler

Browse source 
Follow up to I35a51df6ece2e48e086e722337d4c6bba427eeb4

1) the insertBefore function raises a JS error
2) We must take into account portlets added before the
Vector hook is registered.
3) Register the portlet in main. Loading the module should
not have side effects.

Bug: T303488
Change-Id: Iee6b308d6da63bc53bcba0fa5bb383d88787892a
This commit is contained in:
Jon Robson 2023-07-26 13:48:39 -07:00
parent 48af341410
commit 6b81214687
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
resources/skins.vector.js/portlets.js
View file

@ -8,8 +8,8 @@
/**
* Creates default portlet.
*
* @param {HTMLElement} portlet
* @return {HTMLElement}
* @param {Element} portlet
* @return {Element}
*/
function addDefaultPortlet( portlet ) {
const ul = portlet.querySelector( 'ul' );
@ -22,8 +22,8 @@ function addDefaultPortlet( portlet ) {
const labelDiv = document.createElement( 'div' );
labelDiv.classList.add( 'vector-menu-heading' );
labelDiv.innerHTML = label.innerText;
portlet.insertBefore( labelDiv, label );
label.remove();
portlet.insertBefore( labelDiv, ul );
}
let wrapper = portlet.querySelector( 'div:last-child' );
if ( wrapper ) {
@ -45,21 +45,22 @@ function addDefaultPortlet( portlet ) {
* A hook handler for util.addPortlet hook.
* It creates a portlet based on the hint, and adabt it to vector skin.
*
* @param {HTMLElement} portlet
* @return {HTMLElement}
* @param {Element} portlet
* @return {Element}
*/
function addPortletHandler( portlet ) {
portlet.classList.remove( 'mw-portlet-js' );
return addDefaultPortlet( portlet );
}
mw.hook( 'util.addPortlet' ).add( addPortletHandler );
/**
*
* @return {{addPortletHandler: (function(HTMLElement): HTMLElement)}}
* @return {{addPortletHandler: (function(Element): Element)}}
*/
function main() {
mw.hook( 'util.addPortlet' ).add( addPortletHandler );
// Update any portlets that were created prior to the hook being registered.
document.querySelectorAll( '.mw-portlet-js' ).forEach( addPortletHandler );
return {
addPortletHandler
};