From 4bc4301f90b0f1b9c45f8d20071cfce3ee2177ca Mon Sep 17 00:00:00 2001
From: alistair3149 <alistair31494322@gmail.com>
Date: Sat, 27 Apr 2024 18:02:23 -0400
Subject: [PATCH] =?UTF-8?q?fix(prefs):=20=F0=9F=90=9B=20incorrect=20functi?=
 =?UTF-8?q?on=20call=20for=20addPortlet?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes: #832
---
 .../addPortlet.polyfill.js                    | 75 ++++++++++---------
 1 file changed, 40 insertions(+), 35 deletions(-)

diff --git a/resources/skins.citizen.preferences/addPortlet.polyfill.js b/resources/skins.citizen.preferences/addPortlet.polyfill.js
index b972d343..52247d9e 100644
--- a/resources/skins.citizen.preferences/addPortlet.polyfill.js
+++ b/resources/skins.citizen.preferences/addPortlet.polyfill.js
@@ -40,48 +40,53 @@ function addDefaultPortlet( portlet ) {
 }
 
 /**
- * Polyfill for mw.util.addPortlet for < MW 1.42
+ * Polyfill for mw.util.addPortlet for < MW 1.41
+ * Creates a detached portlet Element in the skin with no elements.
  *
- * @return {Element}
+ * @param {string} id of the new portlet.
+ * @param {string} [label] of the new portlet.
+ * @param {string} [before] selector of the element preceding the new portlet. If not passed
+ *  the caller is responsible for appending the element to the DOM before using addPortletLink.
+ * @return {HTMLElement|null} will be null if it was not possible to create an portlet with
+ *  the required information e.g. the selector given in before parameter could not be resolved
+ *  to an existing element in the page.
  */
-function addPortlet() {
+function addPortlet( id, label, before ) {
 	if ( mw.util.addPortlet ) {
-		return addDefaultPortlet( mw.util.addPortlet );
+		return addDefaultPortlet( mw.util.addPortlet( id, label, before ) );
 	}
 
-	return function ( id, label, before ) {
-		const portlet = document.createElement( 'div' );
-		portlet.classList.add( 'mw-portlet', 'mw-portlet-' + id, 'emptyPortlet',
-			// Additional class is added to allow skins to track portlets added via this mechanism.
-			'mw-portlet-js'
-		);
-		portlet.id = id;
-		if ( label ) {
-			const labelNode = document.createElement( 'label' );
-			labelNode.textContent = label;
-			portlet.appendChild( labelNode );
+	const portlet = document.createElement( 'div' );
+	portlet.classList.add( 'mw-portlet', 'mw-portlet-' + id, 'emptyPortlet',
+		// Additional class is added to allow skins to track portlets added via this mechanism.
+		'mw-portlet-js'
+	);
+	portlet.id = id;
+	if ( label ) {
+		const labelNode = document.createElement( 'label' );
+		labelNode.textContent = label;
+		portlet.appendChild( labelNode );
+	}
+	const listWrapper = document.createElement( 'div' );
+	const list = document.createElement( 'ul' );
+	listWrapper.appendChild( list );
+	portlet.appendChild( listWrapper );
+	if ( before ) {
+		let referenceNode;
+		try {
+			referenceNode = document.querySelector( before );
+		} catch ( e ) {
+			// CSS selector not supported by browser.
 		}
-		const listWrapper = document.createElement( 'div' );
-		const list = document.createElement( 'ul' );
-		listWrapper.appendChild( list );
-		portlet.appendChild( listWrapper );
-		if ( before ) {
-			let referenceNode;
-			try {
-				referenceNode = document.querySelector( before );
-			} catch ( e ) {
-				// CSS selector not supported by browser.
-			}
-			if ( referenceNode ) {
-				const parentNode = referenceNode.parentNode;
-				parentNode.insertBefore( portlet, referenceNode );
-			} else {
-				return null;
-			}
+		if ( referenceNode ) {
+			const parentNode = referenceNode.parentNode;
+			parentNode.insertBefore( portlet, referenceNode );
+		} else {
+			return null;
 		}
-		mw.hook( 'util.addPortlet' ).fire( portlet, before );
-		return addDefaultPortlet( portlet );
-	};
+	}
+	mw.hook( 'util.addPortlet' ).fire( portlet, before );
+	return addDefaultPortlet( portlet );
 }
 
 /** @module addPortlet */