mirror of
https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor
synced 2024-11-24 22:35:41 +00:00
Merge "Stop requiring deprecated EditPage::getCheckboxes()"
This commit is contained in:
jenkins-bot
Gerrit Code Review
commit
9ef0f71983
|
|
@ -449,7 +449,24 @@ class ApiVisualEditor extends ApiBase {
|
|||
( $user->getOption( 'watchcreations' ) && !$title->exists() ) ||
|
||||
$user->isWatched( $title ),
|
||||
];
|
||||
$checkboxes = $editPage->getCheckboxes( $tabindex, $states );
|
||||
$checkboxes = method_exists( $editPage, 'getCheckboxes' )
|
||||
? $editPage->getCheckboxes( $tabindex, $states ) : '';
|
||||
$checkboxesDef = $editPage->getCheckboxesDefinition( $states );
|
||||
$checkboxesMessages = [];
|
||||
foreach ( $checkboxesDef as $name => $options ) {
|
||||
if ( isset( $options['tooltip'] ) ) {
|
||||
$checkboxesMessages[ "accesskey-{$options['tooltip']}" ] =
|
||||
$this->msg( "accesskey-{$options['tooltip']}" )->plain();
|
||||
$checkboxesMessages[ "tooltip-{$options['tooltip']}" ] =
|
||||
$this->msg( "tooltip-{$options['tooltip']}" )->plain();
|
||||
}
|
||||
if ( isset( $options['title-message'] ) ) {
|
||||
$checkboxesMessages[ $options['title-message'] ] =
|
||||
$this->msg( $options['title-message'] )->plain();
|
||||
}
|
||||
$checkboxesMessages[ $options['label-message'] ] =
|
||||
$this->msg( $options['label-message'] )->plain();
|
||||
}
|
||||
$templates = $editPage->makeTemplatesOnThisPageList( $editPage->getTemplates() );
|
||||
|
||||
// HACK: Find out which red links are on the page
|
||||
|
|
@ -493,10 +510,16 @@ class ApiVisualEditor extends ApiBase {
|
|||
|
||||
// On parser cache miss, just don't bother populating red link data
|
||||
|
||||
foreach ( $checkboxesDef as &$value ) {
|
||||
// Don't convert the boolean to empty string with formatversion=1
|
||||
$value[ApiResult::META_BC_BOOLS] = [ 'default' ];
|
||||
}
|
||||
$result = [
|
||||
'result' => 'success',
|
||||
'notices' => $notices,
|
||||
'checkboxes' => $checkboxes,
|
||||
'checkboxesDef' => $checkboxesDef,
|
||||
'checkboxesMessages' => $checkboxesMessages,
|
||||
'templates' => $templates,
|
||||
'links' => $links,
|
||||
'protectedClasses' => implode( ' ', $protectedClasses ),
|
||||
|
|
|
|||
|
|
@ -48,7 +48,6 @@ ve.init.mw.ArticleTarget = function VeInitMwArticleTarget( pageName, revisionId,
|
|||
this.$templatesUsed = null;
|
||||
this.checkboxFields = null;
|
||||
this.checkboxesByName = null;
|
||||
this.$otherFields = null;
|
||||
|
||||
// Sometimes we actually don't want to send a useful oldid
|
||||
// if we do, PostEdit will give us a 'page restored' message
|
||||
|
|
@ -259,8 +258,8 @@ ve.init.mw.ArticleTarget.prototype.updateTabs = function ( editing ) {
|
|||
* @param {string} status Text status message
|
||||
*/
|
||||
ve.init.mw.ArticleTarget.prototype.loadSuccess = function ( response ) {
|
||||
var i, len, linkData, aboutDoc, docRevId, docRevIdMatches, $checkboxes, defaults,
|
||||
target = this,
|
||||
var i, len, linkData, aboutDoc, docRevId, docRevIdMatches,
|
||||
name, options, accesskey, title, $label, checkbox,
|
||||
data = response ? ( response.visualeditor || response.visualeditoredit ) : null;
|
||||
|
||||
if ( !data || typeof data.content !== 'string' ) {
|
||||
|
|
@ -280,7 +279,8 @@ ve.init.mw.ArticleTarget.prototype.loadSuccess = function ( response ) {
|
|||
this.startTimeStamp = data.starttimestamp;
|
||||
this.revid = data.oldid;
|
||||
|
||||
this.checkboxes = data.checkboxes;
|
||||
this.checkboxesDef = data.checkboxesDef;
|
||||
mw.messages.set( data.checkboxesMessages );
|
||||
this.$templatesUsed = $( data.templates );
|
||||
|
||||
aboutDoc = this.doc.documentElement.getAttribute( 'about' );
|
||||
|
|
@ -340,60 +340,43 @@ ve.init.mw.ArticleTarget.prototype.loadSuccess = function ( response ) {
|
|||
|
||||
this.checkboxFields = [];
|
||||
this.checkboxesByName = {};
|
||||
this.$otherFields = $( [] );
|
||||
if ( [ 'edit', 'submit' ].indexOf( mw.util.getParamValue( 'action' ) ) !== -1 ) {
|
||||
$( '#firstHeading' ).text(
|
||||
mw.Title.newFromText( mw.config.get( 'wgPageName' ) ).getPrefixedText()
|
||||
);
|
||||
}
|
||||
|
||||
if ( this.checkboxes ) {
|
||||
defaults = {};
|
||||
$( '.editCheckboxes input' ).each( function () {
|
||||
defaults[ this.name ] = this.checked;
|
||||
} );
|
||||
if ( this.checkboxesDef ) {
|
||||
for ( name in this.checkboxesDef ) {
|
||||
options = this.checkboxesDef[ name ];
|
||||
|
||||
$checkboxes = $( '<div>' ).html( ve.getObjectValues( this.checkboxes ).join( '' ) );
|
||||
$checkboxes.find( 'input[type=checkbox]' ).each( function () {
|
||||
var $label, title, checkbox,
|
||||
$this = $( this ),
|
||||
name = $this.attr( 'name' ),
|
||||
id = $this.attr( 'id' );
|
||||
|
||||
if ( !name ) {
|
||||
// This really shouldn't happen..
|
||||
return;
|
||||
accesskey = null;
|
||||
title = null;
|
||||
if ( options.tooltip ) {
|
||||
accesskey = mw.message( 'accesskey-' + options.tooltip ).text();
|
||||
title = mw.message( 'tooltip-' + options.tooltip ).text();
|
||||
}
|
||||
|
||||
// Label with for=id
|
||||
if ( id ) {
|
||||
$label = $checkboxes.find( 'label[for=' + id + ']' );
|
||||
if ( options[ 'title-message' ] ) {
|
||||
title = mw.message( options[ 'title-message' ] ).text();
|
||||
}
|
||||
// Label wrapped input
|
||||
if ( !$label ) {
|
||||
$label = $this.closest( 'label' );
|
||||
}
|
||||
if ( $label ) {
|
||||
title = $label.attr( 'title' );
|
||||
$label = $( '<span>' ).append( mw.message( options[ 'label-message' ] ).parseDom() );
|
||||
ve.targetLinksToNewWindow( $label[ 0 ] );
|
||||
}
|
||||
|
||||
checkbox = new OO.ui.CheckboxInputWidget( {
|
||||
value: $this.attr( 'value' ),
|
||||
selected: defaults[ name ] !== undefined ? defaults[ name ] : $this.prop( 'checked' ),
|
||||
accessKey: accesskey,
|
||||
selected: options.default,
|
||||
classes: [ 've-ui-mwSaveDialog-checkbox-' + name ]
|
||||
} );
|
||||
// HACK: CheckboxInputWidget doesn't support access keys
|
||||
checkbox.$input.attr( 'accesskey', $( this ).attr( 'accesskey' ) );
|
||||
target.checkboxFields.push(
|
||||
|
||||
this.checkboxFields.push(
|
||||
new OO.ui.FieldLayout( checkbox, {
|
||||
align: 'inline',
|
||||
label: $label ? $label.contents() : undefined,
|
||||
label: $label.contents(),
|
||||
title: title
|
||||
} )
|
||||
);
|
||||
target.checkboxesByName[ name ] = checkbox;
|
||||
} );
|
||||
this.$otherFields = $checkboxes.find( 'input[type!=checkbox]' );
|
||||
this.checkboxesByName[ name ] = checkbox;
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
|
|
@ -1538,13 +1521,6 @@ ve.init.mw.ArticleTarget.prototype.getSaveFields = function () {
|
|||
fields[ name ] = this.checkboxesByName[ name ].getValue();
|
||||
}
|
||||
}
|
||||
this.$otherFields.each( function () {
|
||||
var $this = $( this ),
|
||||
name = $this.prop( 'name' );
|
||||
if ( name ) {
|
||||
fields[ name ] = $this.val();
|
||||
}
|
||||
} );
|
||||
|
||||
return fields;
|
||||
};
|
||||
|
|
@ -2224,7 +2200,7 @@ ve.init.mw.ArticleTarget.prototype.switchToWikitextEditor = function ( discardCh
|
|||
data.basetimestamp = target.baseTimeStamp;
|
||||
data.starttimestamp = target.startTimeStamp;
|
||||
data.oldid = target.revid;
|
||||
data.checkboxes = target.checkboxes;
|
||||
data.checkboxesDef = target.checkboxesDef;
|
||||
return response;
|
||||
} );
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue