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

Merge "Allow &veaction=editsource to load 2017WTE regardless of user prefs"

Browse source
This commit is contained in:
jenkins-bot 2024-08-30 06:20:42 +00:00 committed by Gerrit Code Review
parent 1b777d45e0 c93d4a9695
commit f363c943cc
2 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
modules/ve-mw/preinit/ve.init.mw.ArticleTargetLoader.js
View file

@ -30,12 +30,8 @@
const url = new URL( location.href );
// Provide the new wikitext editor
if (
conf.enableWikitext &&
(
mw.user.options.get( 'visualeditor-newwikitext' ) ||
url.searchParams.get( 'veaction' ) === 'editsource'
) &&
mw.loader.getState( 'ext.visualEditor.mwwikitext' )
mw.user.options.get( 'visualeditor-newwikitext' ) ||
url.searchParams.get( 'veaction' ) === 'editsource'
) {
modules.push( 'ext.visualEditor.mwwikitext' );
}

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

@ -1351,11 +1351,14 @@
init.isWikitextAvailable = (
init.isAvailable &&
// Enabled on site
conf.enableWikitext &&
// If forced by the URL parameter, skip the checks (T239796)
( url.searchParams.get( 'veaction' ) === 'editsource' || (
// Enabled on site
conf.enableWikitext &&
// User preference
mw.user.options.get( 'visualeditor-newwikitext' ) &&
// User preference
mw.user.options.get( 'visualeditor-newwikitext' )
) ) &&
// Only on wikitext pages
mw.config.get( 'wgPageContentModel' ) === 'wikitext'