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

NWE: Don't change editor preference if visual mode not available

Browse source 
Bug: T246259
Change-Id: I1513098be707ca5c1a40a061917487785f5100e8
This commit is contained in:
Ed Sanders 2020-02-26 20:22:18 +00:00
parent 4a2d636dab
commit 71157aab76
1 changed files with 25 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
modules/ve-mw/preinit/ve.init.mw.DesktopArticleTarget.init.js
View file

@ -286,10 +286,24 @@
return mw.msg( tabMsgKey ); return mw.msg( tabMsgKey );
} }
/**
* Set the user's new preferred editor
*
* @param {string} editor Preferred editor, 'visualeditor' or 'wikitext'
* @return {jQuery.Promise} Promise which resolves when the preference has been set
*/
function setEditorPreference( editor ) { function setEditorPreference( editor ) {
var key = pageExists ? 'edit' : 'create', var key = pageExists ? 'edit' : 'create',
sectionKey = 'editsection'; sectionKey = 'editsection';
// If visual mode isn't available, don't set the editor preference as the
// user has expressed no choice by opening this editor. (T246259)
// Strictly speaking the same thing should happen if visual mode is
// available but source mode isn't, but that is never the case.
if ( !init.isVisualAvailable ) {
return $.Deferred().resolve().promise();
}
if ( editor !== 'visualeditor' && editor !== 'wikitext' ) { if ( editor !== 'visualeditor' && editor !== 'wikitext' ) {
throw new Error( 'setEditorPreference called with invalid option: ', editor ); throw new Error( 'setEditorPreference called with invalid option: ', editor );
} }
@ -311,16 +325,18 @@
} }
$.cookie( 'VEE', editor, { path: '/', expires: 30 } ); $.cookie( 'VEE', editor, { path: '/', expires: 30 } );
if ( mw.user.isAnon() ) {
return $.Deferred().resolve().promise(); // Save user preference if logged in
if (
!mw.user.isAnon() &&
mw.user.options.get( 'visualeditor-editor' ) !== editor
) {
// Same as ve.init.target.getLocalApi()
return new mw.Api().saveOption( 'visualeditor-editor', editor ).then( function () {
mw.user.options.set( 'visualeditor-editor', editor );
} );
} }
if ( mw.user.options.get( 'visualeditor-editor' ) === editor ) { return $.Deferred().resolve().promise();
return $.Deferred().resolve().promise();
}
// Same as ve.init.target.getLocalApi()
return new mw.Api().saveOption( 'visualeditor-editor', editor ).then( function () {
mw.user.options.set( 'visualeditor-editor', editor );
} );
} }
/** /**