Merge branch 'master' into variable-pattern

NovemLinguae · Nov 27, 2024 · 0ebab3c · 0ebab3c
2 parents 0a97299 + 001f236
commit 0ebab3c
Show file tree

Hide file tree

Showing 24 changed files with 306 additions and 285 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -14,6 +14,9 @@
 		"array-bracket-spacing": "off",
 		"camelcase": "off",
 		"computed-property-spacing": "off",
+		"indent": "off",
+		"jsdoc/require-param": "off",
+		"jsdoc/require-returns": "off",
 		"max-len": "off",
 		"no-alert": "off",
 		"no-jquery/no-class-state": "off",
@@ -41,13 +44,10 @@
 
 		"es-x/no-array-prototype-includes": "warn",
 		"es-x/no-object-values": "warn",
-		"indent": "off",
-		"jsdoc/require-asterisk-prefix": "warn",
 		"mediawiki/class-doc": "warn",
 		"new-cap": "warn",
 		"no-jquery/no-constructor-attributes": "warn",
 		"no-jquery/no-each-util": "warn",
-		"no-jquery/no-extend": "warn",
 		"no-jquery/no-grep": "warn",
 		"no-jquery/no-in-array": "warn",
 		"no-jquery/no-map-util": "warn",
@@ -59,12 +59,10 @@
 		"no-script-url": "warn",
 		"no-sequences": "warn",
 		"no-throw-literal": "warn",
-		"no-unneeded-ternary": "warn",
 		"no-unused-expressions": "warn",
 		"no-use-before-define": "warn",
 		"no-useless-concat": "warn",
 		"no-var": "warn",
-		"operator-linebreak": "warn",
 		"prefer-const": "warn"
 	}
 }
diff --git a/gadget.txt b/gadget.txt
@@ -1,4 +1,4 @@
-* Twinkle [ResourceLoader |dependencies=ext.gadget.morebits, ext.gadget.select2, mediawiki.api, mediawiki.language |rights=autoconfirmed |type=general |peers=Twinkle-pagestyles |requiresES6] |Twinkle.js |Twinkle.css |twinklearv.js |twinklewarn.js |twinkleblock.js |twinklewelcome.js |twinkleshared.js |twinkletalkback.js |twinklespeedy.js |twinkleprod.js |twinklexfd.js |twinkleimage.js |twinkleprotect.js |twinkletag.js |twinklediff.js |twinkleunlink.js |twinklerollback.js |twinkledeprod.js |twinklebatchdelete.js |twinklebatchprotect.js |twinklebatchundelete.js |twinkleconfig.js
-* morebits [ResourceLoader |dependencies=mediawiki.user, mediawiki.util, mediawiki.Title, jquery.ui |hidden |requiresES6] |morebits.js |morebits.css
+* Twinkle [ResourceLoader |dependencies=ext.gadget.morebits, ext.gadget.select2, mediawiki.api, mediawiki.language |rights=autoconfirmed |type=general |peers=Twinkle-pagestyles] |Twinkle.js |Twinkle.css |twinklearv.js |twinklewarn.js |twinkleblock.js |twinklewelcome.js |twinkleshared.js |twinkletalkback.js |twinklespeedy.js |twinkleprod.js |twinklexfd.js |twinkleimage.js |twinkleprotect.js |twinkletag.js |twinklediff.js |twinkleunlink.js |twinklerollback.js |twinkledeprod.js |twinklebatchdelete.js |twinklebatchprotect.js |twinklebatchundelete.js |twinkleconfig.js
+* morebits [ResourceLoader |dependencies=mediawiki.user, mediawiki.util, mediawiki.Title, jquery.ui |hidden] |morebits.js |morebits.css
 * Twinkle-pagestyles [hidden |skins=vector, vector-2022] |Twinkle-pagestyles.css
 * select2 [ResourceLoader |hidden] |select2.min.js |select2.min.css
diff --git a/modules/twinklearv.js b/modules/twinklearv.js
@@ -1,6 +1,6 @@
 // <nowiki>
 
-(function($) {
+(function() {
 
 /*
  ****************************************
@@ -373,10 +373,10 @@ Twinkle.arv.callback.changeCategory = function (e) {
 							} else {
 								for (let i = 0; i < page.revisions.length; ++i) {
 									const rev = page.revisions[i];
-									const $entry = $('<div/>', {
+									const $entry = $('<div>', {
 										class: 'entry'
 									});
-									const $input = $('<input/>', {
+									const $input = $('<input>', {
 										type: 'checkbox',
 										name: 's_' + field,
 										value: rev.revid
@@ -397,15 +397,15 @@ Twinkle.arv.callback.changeCategory = function (e) {
 
 							// add free form input for resolves
 							if (field === 'resolves') {
-								const $free_entry = $('<div/>', {
+								const $free_entry = $('<div>', {
 									class: 'entry'
 								});
-								const $free_input = $('<input/>', {
+								const $free_input = $('<input>', {
 									type: 'text',
 									name: 's_resolves_free'
 								});
 
-								const $free_label = $('<label/>', {
+								const $free_label = $('<label>', {
 									for: 's_resolves_free',
 									html: 'URL link of diff with additional discussions: '
 								});
@@ -468,11 +468,11 @@ Twinkle.arv.callback.changeCategory = function (e) {
 };
 
 Twinkle.arv.callback.evaluate = function(e) {
-	var form = e.target;
-	var reason = '';
-	var input = Morebits.quickForm.getInputData(form);
+	const form = e.target;
+	let reason = '';
+	const input = Morebits.quickForm.getInputData(form);
 
-	var uid = form.uid.value;
+	const uid = form.uid.value;
 
 	switch (input.category) {
 
@@ -725,8 +725,8 @@ Twinkle.arv.callback.evaluate = function(e) {
 };
 
 Twinkle.arv.callback.getAivReasonWikitext = function(input) {
-	var text = '';
-	var type = input.arvtype;
+	let text = '';
+	let type = input.arvtype;
 
 	if (!type.length && input.reason === '') {
 		return null;
@@ -763,15 +763,15 @@ Twinkle.arv.callback.getAivReasonWikitext = function(input) {
 	}
 
 	if (input.reason !== '') {
-		var textEndsInPunctuationOrBlank = /([.?!;:]|^)$/.test(text);
+		const textEndsInPunctuationOrBlank = /([.?!;:]|^)$/.test(text);
 		text += textEndsInPunctuationOrBlank ? '' : '.';
-		var textIsBlank = text === '';
+		const textIsBlank = text === '';
 		text += textIsBlank ? '' : ' ';
 		text += input.reason;
 	}
 
 	text = text.trim();
-	var textEndsInPunctuation = /[.?!;]$/.test(text);
+	const textEndsInPunctuation = /[.?!;]$/.test(text);
 	if (!textEndsInPunctuation) {
 		text += '.';
 	}
@@ -795,18 +795,18 @@ Twinkle.arv.callback.getUsernameReportWikitext = function(input) {
 	}
 
 	// a or an?
-	var adjective = 'a';
+	let adjective = 'a';
 	if (/[aeiouwyh]/.test(input.arvtype[0] || '')) { // non 100% correct, but whatever, including 'h' for Cockney
 		adjective = 'an';
 	}
 
-	var text = '*{{user-uaa|1=' + input.uid + '}} &ndash; ';
+	let text = '*{{user-uaa|1=' + input.uid + '}} &ndash; ';
 	if (input.arvtype.length) {
 		text += 'Violation of the username policy as ' + adjective + ' ' + input.arvtype + ' username. ';
 	}
 	if (input.reason !== '') {
 		text += Morebits.string.toUpperCaseFirstChar(input.reason);
-		var endsInPeriod = /\.$/.test(input.reason);
+		const endsInPeriod = /\.$/.test(input.reason);
 		if (!endsInPeriod) {
 			text += '.';
 		}
@@ -980,6 +980,6 @@ Twinkle.arv.processAN3 = function(params) {
 };
 
 Twinkle.addInitCallback(Twinkle.arv, 'arv');
-}(jQuery));
+}());
 
 // </nowiki>
diff --git a/modules/twinklebatchdelete.js b/modules/twinklebatchdelete.js
@@ -1,6 +1,6 @@
 // <nowiki>
 
-(function($) {
+(function() {
 
 /*
  ****************************************
@@ -597,7 +597,7 @@ Twinkle.batchdelete.callbacks = {
 		unlinker.setPageList(pages);
 		unlinker.run((pageName) => {
 			const wikipedia_page = new Morebits.wiki.page(pageName, 'Unlinking on ' + pageName);
-			const params = $.extend({}, apiobj.params);
+			const params = Object.assign({}, apiobj.params);
 			params.title = pageName;
 			params.unlinker = unlinker;
 			wikipedia_page.setCallbackParameters(params);
@@ -648,7 +648,7 @@ Twinkle.batchdelete.callbacks = {
 		unlinker.setPageList(pages);
 		unlinker.run((pageName) => {
 			const wikipedia_page = new Morebits.wiki.page(pageName, 'Removing file usages on ' + pageName);
-			const params = $.extend({}, apiobj.params);
+			const params = Object.assign({}, apiobj.params);
 			params.title = pageName;
 			params.unlinker = unlinker;
 			wikipedia_page.setCallbackParameters(params);
@@ -690,6 +690,6 @@ Twinkle.batchdelete.callbacks = {
 };
 
 Twinkle.addInitCallback(Twinkle.batchdelete, 'batchdelete');
-}(jQuery));
+}());
 
 // </nowiki>
diff --git a/modules/twinklebatchprotect.js b/modules/twinklebatchprotect.js
@@ -1,6 +1,6 @@
 // <nowiki>
 
-(function($) {
+(function() {
 
 /*
  ****************************************
@@ -288,7 +288,7 @@ Twinkle.batchprotect.callback.evaluate = function twinklebatchprotectCallbackEva
 		};
 		const wikipedia_api = new Morebits.wiki.api('Checking if page ' + pageName + ' exists', query,
 			Twinkle.batchprotect.callbacks.main, null, batchOperation.workerFailure);
-		wikipedia_api.params = $.extend({
+		wikipedia_api.params = Object.assign({
 			page: pageName,
 			batchOperation: batchOperation
 		}, input);
@@ -333,6 +333,6 @@ Twinkle.batchprotect.callbacks = {
 };
 
 Twinkle.addInitCallback(Twinkle.batchprotect, 'batchprotect');
-}(jQuery));
+}());
 
 // </nowiki>
diff --git a/modules/twinklebatchundelete.js b/modules/twinklebatchundelete.js
@@ -1,6 +1,6 @@
 // <nowiki>
 
-(function($) {
+(function() {
 
 /*
  ****************************************
@@ -204,6 +204,6 @@ Twinkle.batchundelete.callbacks = {
 };
 
 Twinkle.addInitCallback(Twinkle.batchundelete, 'batchundelete');
-}(jQuery));
+}());
 
 // </nowiki>
diff --git a/modules/twinkleblock.js b/modules/twinkleblock.js
@@ -1,9 +1,9 @@
 // <nowiki>
 
-(function($) {
+(function() {
 
 let api = new mw.Api(), relevantUserName, blockedUserName;
-const menuFormattedNamespaces = $.extend({}, mw.config.get('wgFormattedNamespaces'));
+const menuFormattedNamespaces = Object.assign({}, mw.config.get('wgFormattedNamespaces'));
 menuFormattedNamespaces[0] = '(Article)';
 
 /*
@@ -1897,7 +1897,7 @@ Twinkle.block.callback.issue_template = function twinkleblockCallbackIssueTempla
 	// "talk page" of an IP range (which does not exist)
 	const userTalkPage = 'User_talk:' + mw.config.get('wgRelevantUserName');
 
-	const params = $.extend(formData, {
+	const params = Object.assign(formData, {
 		messageData: Twinkle.block.blockPresetsInfo[formData.template],
 		reason: Twinkle.block.field_template_options.block_reason,
 		disabletalk: Twinkle.block.field_template_options.notalk,
@@ -2039,6 +2039,6 @@ Twinkle.block.callback.main = function twinkleblockcallbackMain(pageobj) {
 };
 
 Twinkle.addInitCallback(Twinkle.block, 'block');
-}(jQuery));
+}());
 
 // </nowiki>
diff --git a/modules/twinkleconfig.js b/modules/twinkleconfig.js
@@ -1,6 +1,6 @@
 // <nowiki>
 
-(function($) {
+(function() {
 
 /*
  ****************************************
@@ -1727,6 +1727,6 @@ Twinkle.config.saveSuccess = function twinkleconfigSaveSuccess(pageobj) {
 };
 
 Twinkle.addInitCallback(Twinkle.config.init);
-}(jQuery));
+}());
 
 // </nowiki>
diff --git a/modules/twinkledeprod.js b/modules/twinkledeprod.js
@@ -1,6 +1,6 @@
 // <nowiki>
 
-(function($) {
+(function() {
 
 /*
 ****************************************
@@ -184,6 +184,6 @@ var callback_commit = function(event) {
 	};
 
 Twinkle.addInitCallback(Twinkle.deprod, 'deprod');
-}(jQuery));
+}());
 
 // </nowiki>
diff --git a/modules/twinklediff.js b/modules/twinklediff.js
@@ -1,6 +1,6 @@
 // <nowiki>
 
-(function($) {
+(function() {
 
 /*
  ****************************************
@@ -75,6 +75,6 @@ Twinkle.diff.callbacks = {
 };
 
 Twinkle.addInitCallback(Twinkle.diff, 'diff');
-}(jQuery));
+}());
 
 // </nowiki>
diff --git a/modules/twinkleimage.js b/modules/twinkleimage.js
@@ -1,6 +1,6 @@
 // <nowiki>
 
-(function($) {
+(function() {
 
 /*
  ****************************************
@@ -212,7 +212,7 @@ Twinkle.image.callback.evaluate = function twinkleimageCallbackEvaluate(event) {
 	const lognomination = Twinkle.getPref('logSpeedyNominations') && Twinkle.getPref('noLogOnSpeedyNomination').indexOf(csdcrit.toLowerCase()) === -1;
 	const templatename = input.derivative ? 'dw ' + input.type : input.type;
 
-	const params = $.extend({
+	const params = Object.assign({
 		templatename: templatename,
 		normalized: csdcrit,
 		lognomination: lognomination
@@ -355,6 +355,6 @@ Twinkle.image.callbacks = {
 };
 
 Twinkle.addInitCallback(Twinkle.image, 'image');
-}(jQuery));
+}());
 
 // </nowiki>
diff --git a/modules/twinkleprod.js b/modules/twinkleprod.js
@@ -1,6 +1,6 @@
 // <nowiki>
 
-(function($) {
+(function() {
 
 /*
  ****************************************
@@ -472,6 +472,6 @@ Twinkle.prod.callback.evaluate = function twinkleprodCallbackEvaluate(e) {
 };
 
 Twinkle.addInitCallback(Twinkle.prod, 'prod');
-}(jQuery));
+}());
 
 // </nowiki>
diff --git a/modules/twinkleprotect.js b/modules/twinkleprotect.js
@@ -1,6 +1,6 @@
 // <nowiki>
 
-(function($) {
+(function() {
 
 /*
  ****************************************
@@ -1653,6 +1653,6 @@ Twinkle.protect.callbacks = {
 };
 
 Twinkle.addInitCallback(Twinkle.protect, 'protect');
-}(jQuery));
+}());
 
 // </nowiki>