wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-09-25 11:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Support QuestyCaptcha and (kind of) MathCaptcha"

Browse source
This commit is contained in:
jenkins-bot 2014-04-30 21:34:04 +00:00 committed by Gerrit Code Review
parent 8f846c502e 94b5c8dfa5
commit 48d025aead
3 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
VisualEditor.php
View file

@ -704,10 +704,12 @@ $wgResourceModules += array(
'hidetoc', 'hidetoc',
'captcha-edit', 'captcha-edit',
// Only used if FancyCaptcha is installed and triggered on save
'captcha-label', 'captcha-label',
'fancycaptcha-edit',
'colon-separator', 'colon-separator',
// Only used if FancyCaptcha is installed and triggered on save
'fancycaptcha-edit',
// Only used if QuestyCaptcha is installed and triggered on save
'questycaptcha-edit'
), ),
'targets' => array( 'desktop', 'mobile' ), 'targets' => array( 'desktop', 'mobile' ),
), ),

11
modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
View file

@ -556,13 +556,22 @@ ve.init.mw.ViewPageTarget.prototype.onSaveErrorCaptcha = function ( editApi ) {
$captchaDiv.append( $captchaDiv.append(
$( '<img>' ).attr( 'src', editApi.captcha.url ) $( '<img>' ).attr( 'src', editApi.captcha.url )
); );
} else if ( editApi.captcha.type === 'simple' ) { // SimpleCaptcha } else if ( editApi.captcha.type === 'simple' || editApi.captcha.type === 'math' ) {
// SimpleCaptcha and MathCaptcha
$captchaParagraph.append( $captchaParagraph.append(
mw.message( 'captcha-edit' ).parse(), mw.message( 'captcha-edit' ).parse(),
'<br>', '<br>',
document.createTextNode( editApi.captcha.question ) document.createTextNode( editApi.captcha.question )
); );
} else if ( editApi.captcha.type === 'question' ) {
// QuestyCaptcha
$captchaParagraph.append(
mw.message( 'questycaptcha-edit' ).parse(),
'<br>',
editApi.captcha.question
);
} }
$captchaDiv.append( this.captcha.input.$element ); $captchaDiv.append( this.captcha.input.$element );
this.showSaveError( $captchaDiv, false ); this.showSaveError( $captchaDiv, false );
this.events.trackSaveError( 'captcha' ); this.events.trackSaveError( 'captcha' );

7
modules/ve-mw/init/ve.init.mw.Target.js
View file

@ -662,7 +662,12 @@ ve.init.mw.Target.prototype.onSaveError = function ( doc, saveData, jqXHR, statu
// "question" or "fancy" type of captcha. They all expose differently named properties in the // "question" or "fancy" type of captcha. They all expose differently named properties in the
// API for different things in the UI. At this point we only support the SimpleCaptcha and FancyCaptcha // API for different things in the UI. At this point we only support the SimpleCaptcha and FancyCaptcha
// which we very intuitively detect by the presence of a "url" property. // which we very intuitively detect by the presence of a "url" property.
if ( editApi && editApi.captcha && ( editApi.captcha.url || editApi.captcha.type === 'simple' ) ) { if ( editApi && editApi.captcha && (
editApi.captcha.url ||
editApi.captcha.type === 'simple' ||
editApi.captcha.type === 'math' ||
editApi.captcha.type === 'question'
) ) {
this.emit( 'saveErrorCaptcha', editApi ); this.emit( 'saveErrorCaptcha', editApi );
return; return;
} }