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

Replace uses of mw.Uri with browser native URL

Browse source 
Uses of mediawiki.Uri apparently wasn't explicit but this
makes uses of URL's polyfill explicit which later will
be removed.

Bug: T374314
Change-Id: I62b92b3bc923269226512ab50b0708ce5a382abf
This commit is contained in:
Ebrahim Byagowi 2024-09-17 22:52:48 +03:30
parent bac39ab8fe
commit 639dbc5cd7
6 changed files with 27 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ReCaptchaNoCaptcha/extension.json
View file

@ -36,6 +36,9 @@
},
"ResourceModules": {
"ext.confirmEdit.reCaptchaNoCaptcha.visualEditor": {
"dependencies": [
"web2017-polyfills"
],
"scripts": "ve-confirmedit-reCaptchaNoCaptcha/ve.init.mw.NoCaptchaReCaptchaSaveErrorHandler.js"
}
},

14
ReCaptchaNoCaptcha/resources/ve-confirmedit-reCaptchaNoCaptcha/ve.init.mw.NoCaptchaReCaptchaSaveErrorHandler.js
View file

@ -8,15 +8,13 @@ mw.loader.using( 'ext.visualEditor.targetLoader' ).then( () => {
ve.init.mw.NoCaptchaReCaptchaSaveErrorHandler.static.name = 'confirmEditNoCaptchaReCaptcha';
ve.init.mw.NoCaptchaReCaptchaSaveErrorHandler.static.getReadyPromise = function () {
const onLoadFn = 'onRecaptchaLoadCallback' + Date.now();
let deferred, config, scriptURL, params;
if ( !this.readyPromise ) {
deferred = $.Deferred();
config = mw.config.get( 'wgConfirmEditConfig' );
scriptURL = new mw.Uri( config.reCaptchaScriptURL );
params = { onload: onLoadFn, render: 'explicit' };
scriptURL.query = Object.assign( scriptURL.query, params );
const deferred = $.Deferred();
const config = mw.config.get( 'wgConfirmEditConfig' );
const scriptURL = new URL( config.reCaptchaScriptURL, location.href );
const onLoadFn = 'onRecaptchaLoadCallback' + Date.now();
scriptURL.searchParams.set( 'onload', onLoadFn );
scriptURL.searchParams.set( 'render', 'explicit' );
this.readyPromise = deferred.promise();
window[ onLoadFn ] = deferred.resolve;

3
Turnstile/extension.json
View file

@ -37,6 +37,9 @@
},
"ResourceModules": {
"ext.confirmEdit.turnstile.visualEditor": {
"dependencies": [
"web2017-polyfills"
],
"scripts": "ve-confirmedit-turnstile/ve.init.mw.TurnstileSaveErrorHandler.js"
}
},

14
Turnstile/resources/ve-confirmedit-turnstile/ve.init.mw.TurnstileSaveErrorHandler.js
View file

@ -8,15 +8,13 @@ mw.loader.using( 'ext.visualEditor.targetLoader' ).then( () => {
ve.init.mw.TurnstileSaveErrorHandler.static.name = 'confirmEditTurnstile';
ve.init.mw.TurnstileSaveErrorHandler.static.getReadyPromise = function () {
const onLoadFn = 'onTurnstileLoadCallback' + Date.now();
let deferred, config, scriptURL, params;
if ( !this.readyPromise ) {
deferred = $.Deferred();
config = mw.config.get( 'wgConfirmEditConfig' );
scriptURL = new mw.Uri( config.turnstileScriptURL );
params = { onload: onLoadFn, render: 'explicit' };
scriptURL.query = Object.assign( scriptURL.query, params );
const deferred = $.Deferred();
const config = mw.config.get( 'wgConfirmEditConfig' );
const scriptURL = new URL( config.turnstileScriptURL, location.href );
const onLoadFn = 'onTurnstileLoadCallback' + Date.now();
scriptURL.searchParams.set( 'onload', onLoadFn );
scriptURL.searchParams.set( 'render', 'explicit' );
this.readyPromise = deferred.promise();
window[ onLoadFn ] = deferred.resolve;

3
hCaptcha/extension.json
View file

@ -46,6 +46,9 @@
},
"ResourceModules": {
"ext.confirmEdit.hCaptcha.visualEditor": {
"dependencies": [
"web2017-polyfills"
],
"packageFiles": [
"ve-confirmedit-hCaptcha/ve.init.mw.HCaptchaSaveErrorHandler.js",
{

13
hCaptcha/resources/ve-confirmedit-hCaptcha/ve.init.mw.HCaptchaSaveErrorHandler.js
View file

@ -7,14 +7,13 @@ mw.loader.using( 'ext.visualEditor.targetLoader' ).then( () => {
ve.init.mw.HCaptchaSaveErrorHandler.static.name = 'confirmEditHCaptcha';
ve.init.mw.HCaptchaSaveErrorHandler.static.getReadyPromise = function () {
const onLoadFn = 'onHcaptchaLoadCallback' + Date.now();
let deferred, scriptURL, params;
if ( !this.readyPromise ) {
deferred = $.Deferred();
scriptURL = new mw.Uri( require( './config.json' ).hCaptchaScriptURL );
params = { onload: onLoadFn, render: 'explicit' };
scriptURL.query = Object.assign( scriptURL.query, params );
const deferred = $.Deferred();
const config = require( './config.json' );
const scriptURL = new URL( config.hCaptchaScriptURL, location.href );
const onLoadFn = 'onHcaptchaLoadCallback' + Date.now();
scriptURL.searchParams.set( 'onload', onLoadFn );
scriptURL.searchParams.set( 'render', 'explicit' );
this.readyPromise = deferred.promise();
window[ onLoadFn ] = deferred.resolve;