Florianschmidtwelzow has uploaded a new change for review.
https://gerrit.wikimedia.org/r/186145
Change subject: Remove JS for FancyCaptcha adjustment
......................................................................
Remove JS for FancyCaptcha adjustment
With change If9a68aaee2cf98d63647816ccc8fc0bad12ca3d3 the html output
of FancyCaptcha is wellformed, so there is no need to run this JS code
on UserLogin anymore.
Bug: T87190
Change-Id: I5e60a07ce9451c4e23bfa0e3217c3949bf6b8058
---
M includes/specials/SpecialUserlogin.php
M resources/Resources.php
D resources/src/mediawiki.special/mediawiki.special.userlogin.common.js
3 files changed, 0 insertions(+), 84 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/45/186145/1
diff --git a/includes/specials/SpecialUserlogin.php
b/includes/specials/SpecialUserlogin.php
index f2f6b69..55d6609 100644
--- a/includes/specials/SpecialUserlogin.php
+++ b/includes/specials/SpecialUserlogin.php
@@ -1323,9 +1323,6 @@
'mediawiki.ui.input',
'mediawiki.special.userlogin.common.styles'
) );
- $out->addModules( array(
- 'mediawiki.special.userlogin.common.js'
- ) );
if ( $this->mType == 'signup' ) {
// XXX hack pending RL or JS parse() support for
complex content messages
diff --git a/resources/Resources.php b/resources/Resources.php
index 6e8cd99..039c15f 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1418,15 +1418,6 @@
),
'position' => 'top',
),
- 'mediawiki.special.userlogin.common.js' => array(
- 'scripts' => array(
-
'resources/src/mediawiki.special/mediawiki.special.userlogin.common.js',
- ),
- 'messages' => array(
- 'createacct-captcha',
- 'createacct-imgcaptcha-ph',
- ),
- ),
'mediawiki.special.userlogin.signup.js' => array(
'scripts' =>
'resources/src/mediawiki.special/mediawiki.special.userlogin.signup.js',
'messages' => array(
diff --git
a/resources/src/mediawiki.special/mediawiki.special.userlogin.common.js
b/resources/src/mediawiki.special/mediawiki.special.userlogin.common.js
deleted file mode 100644
index f5289de..0000000
--- a/resources/src/mediawiki.special/mediawiki.special.userlogin.common.js
+++ /dev/null
@@ -1,72 +0,0 @@
-/*!
- * JavaScript for login and signup forms.
- */
-( function ( mw, $ ) {
- // Move the FancyCaptcha image into a more attractive container.
- // The CAPTCHA is in a <div class="captcha"> at the top of the form. If
it's a FancyCaptcha,
- // then we remove it and insert it lower down, in a customized div with
just what we need (e.g.
- // no 'fancycaptcha-createaccount' message).
- function adjustFancyCaptcha( $content, buttonSubmit ) {
- var $submit = $content.find( buttonSubmit ),
- tabIndex,
- $captchaStuff,
- $captchaImageContainer,
- // JavaScript can't yet parse the message
'createacct-imgcaptcha-help' when it
- // contains a MediaWiki transclusion, so PHP parses it
and sends the HTML.
- // This is only set for the signup form (and undefined
for login).
- helpMsg = mw.config.get( 'wgCreateacctImgcaptchaHelp' ),
- helpHtml = '';
-
- if ( !$submit.length ) {
- return;
- }
- tabIndex = $submit.prop( 'tabIndex' ) - 1;
- $captchaStuff = $content.find( '.captcha' );
-
- if ( $captchaStuff.length ) {
- // The FancyCaptcha has this class in the ConfirmEdit
extension since 2013-04-18.
- $captchaImageContainer = $captchaStuff.find(
'.fancycaptcha-image-container' );
- if ( $captchaImageContainer.length !== 1 ) {
- return;
- }
-
- $captchaStuff.remove();
-
- if ( helpMsg ) {
- helpHtml = '<small
class="mw-createacct-captcha-assisted">' + helpMsg + '</small>';
- }
-
- // Insert another div before the submit button that
will include the
- // repositioned FancyCaptcha div, an input field, and
possible help.
- $submit.closest( 'div' ).before( [
- '<div>',
- '<label for="wpCaptchaWord">' +
mw.message( 'createacct-captcha' ).escaped() + '</label>',
- '<div
class="mw-createacct-captcha-container">',
- '<div
class="mw-createacct-captcha-and-reload" />',
- '<input id="wpCaptchaWord"
class="mw-ui-input" name="wpCaptchaWord" type="text" placeholder="' +
- mw.message(
'createacct-imgcaptcha-ph' ).escaped() +
- '" tabindex="' +
tabIndex + '" autocapitalize="off" autocorrect="off">',
- helpHtml,
- '</div>',
- '</div>'
- ].join( '' ) );
-
- // Stick the FancyCaptcha container inside our bordered
and framed parents.
- $captchaImageContainer
- .prependTo( $content.find(
'.mw-createacct-captcha-and-reload' ) );
-
- // Find the input field, add the text (if any) of the
existing CAPTCHA
- // field (although usually it's blanked out on every
redisplay),
- // and after it move over the hidden field that tells
the CAPTCHA
- // what to do.
- $content.find( '#wpCaptchaWord' )
- .val( $captchaStuff.find( '#wpCaptchaWord'
).val() )
- .after( $captchaStuff.find( '#wpCaptchaId' ) );
- }
- }
-
- $( function () {
- // Work with both login and signup form
- adjustFancyCaptcha( $( '#mw-content-text' ), '#wpCreateaccount,
#wpLoginAttempt' );
- } );
-}( mediaWiki, jQuery ) );
--
To view, visit https://gerrit.wikimedia.org/r/186145
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5e60a07ce9451c4e23bfa0e3217c3949bf6b8058
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Florianschmidtwelzow <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
