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

Merge "More minor/watch checkbox state computation server-side"

Browse source
This commit is contained in:
jenkins-bot 2016-04-11 14:18:56 +00:00 committed by Gerrit Code Review
parent 9b9390585d 12eb41acff
commit 5dc1257507
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ApiVisualEditor.php
View file

@ -497,7 +497,12 @@ class ApiVisualEditor extends ApiBase {
$req->setVal( 'format', 'text/x-wiki' );
$ep->importFormData( $req ); // By reference for some reason (bug 52466)
$tabindex = 0;
$states = [ 'minor' => false, 'watch' => false ];
$states = [
'minor' => $user->getOption( 'minordefault' ) && $title->exists(),
'watch' => $user->getOption( 'watchdefault' ) ||
( $user->getOption( 'watchcreations' ) && !$title->exists() ) ||
$user->isWatched( $title ),
];
$checkboxes = $ep->getCheckboxes( $tabindex, $states );
// HACK: Find out which red links are on the page
@ -542,7 +547,6 @@ class ApiVisualEditor extends ApiBase {
'checkboxes' => $checkboxes,
'links' => $links,
'protectedClasses' => implode( ' ', $protectedClasses ),
'watched' => $user->isWatched( $title ),
'basetimestamp' => $baseTimestamp,
'starttimestamp' => wfTimestampNow(),
'oldid' => $oldid,

9
modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
View file

@ -306,12 +306,7 @@ ve.init.mw.DesktopArticleTarget.prototype.loadSuccess = function ( response ) {
}
if ( data.checkboxes ) {
defaults = {
wpMinoredit: !!mw.user.options.get( 'minordefault' ),
wpWatchthis: !!mw.user.options.get( 'watchdefault' ) ||
( !!mw.user.options.get( 'watchcreations' ) && !this.pageExists ) ||
data.watched === ''
};
defaults = {};
$( '.editCheckboxes input' ).each( function () {
defaults[ this.name ] = this.checked;
} );
@ -342,7 +337,7 @@ ve.init.mw.DesktopArticleTarget.prototype.loadSuccess = function ( response ) {
}
checkbox = new OO.ui.CheckboxInputWidget( {
value: $this.attr( 'value' ),
selected: name && defaults[ name ]
selected: defaults[ name ] !== undefined ? defaults[ name ] : $this.prop( 'checked' )
} );
// HACK: CheckboxInputWidget doesn't support access keys
checkbox.$input.attr( 'accesskey', $( this ).attr( 'accesskey' ) );