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

Merge "Simplify 2017 wikitext editor config when Beta Features is enabled"

Browse source
This commit is contained in:
jenkins-bot 2018-02-26 20:32:13 +00:00 committed by Gerrit Code Review
parent 31f7015260 4ede488647
commit 9c9c21c22d
2 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
extension.json
View file

@ -49,6 +49,7 @@
},
"VisualEditorUseChangeTagging": true,
"VisualEditorEnableWikitext": false,
"VisualEditorEnableWikitextBetaFeature": false,
"VisualEditorEnableDiffPage": false,
"VisualEditorEnableDiffPageBetaFeature": false,
"VisualEditorUseSingleEditTab": false,

21
includes/VisualEditorHooks.php
View file

@ -205,8 +205,7 @@ class VisualEditorHooks {
private static function isWikitextAvailable( $title, $user ) {
$veConfig = ConfigFactory::getDefaultInstance()->makeConfig( 'visualeditor' );
return $veConfig->get( 'VisualEditorEnableWikitext' ) &&
$user->getOption( 'visualeditor-newwikitext' ) &&
return $user->getOption( 'visualeditor-newwikitext' ) &&
$title->getContentModel() === 'wikitext';
}
@ -626,10 +625,12 @@ class VisualEditorHooks {
public static function onGetPreferences( User $user, array &$preferences ) {
global $wgLang;
$config = ConfigFactory::getDefaultInstance()->makeConfig( 'visualeditor' );
if ( !class_exists( 'BetaFeatures' ) ) {
// Config option for visual editing "alpha" state (no Beta Feature)
$namespaces = ApiVisualEditor::getAvailableNamespaceIds( $config );
$enablePreference = [
$visualEnablePreference = [
'type' => 'toggle',
'label-message' => [
'visualeditor-preference-enable',
@ -642,10 +643,12 @@ class VisualEditorHooks {
'section' => 'editing/editor'
];
if ( $user->getOption( 'visualeditor-autodisable' ) ) {
$enablePreference['default'] = false;
$visualEnablePreference['default'] = false;
}
$preferences['visualeditor-enable'] = $enablePreference;
$preferences['visualeditor-enable'] = $visualEnablePreference;
}
// Config option for visual editing "deployed" state (opt-out)
$preferences['visualeditor-betatempdisable'] = [
'type' => 'toggle',
'label-message' => 'visualeditor-preference-betatempdisable',
@ -654,6 +657,7 @@ class VisualEditorHooks {
$user->getOption( 'visualeditor-autodisable' )
];
// Config option for Single Edit Tab
if (
$config->get( 'VisualEditorUseSingleEditTab' ) &&
!$user->getOption( 'visualeditor-autodisable' ) &&
@ -714,7 +718,7 @@ class VisualEditorHooks {
]
];
if ( $veConfig->get( 'VisualEditorEnableWikitext' ) ) {
if ( $veConfig->get( 'VisualEditorEnableWikitextBetaFeature' ) ) {
$preferences['visualeditor-newwikitext'] = [
'version' => '1.0',
'label-message' => 'visualeditor-preference-newwikitexteditor-label',
@ -867,7 +871,10 @@ class VisualEditorHooks {
'singleEditTab' => $veConfig->get( 'VisualEditorUseSingleEditTab' ),
'showBetaWelcome' => $veConfig->get( 'VisualEditorShowBetaWelcome' ),
'enableTocWidget' => $veConfig->get( 'VisualEditorEnableTocWidget' ),
'enableWikitext' => $veConfig->get( 'VisualEditorEnableWikitext' ),
'enableWikitext' => (
$veConfig->get( 'VisualEditorEnableWikitext' ) ||
$veConfig->get( 'VisualEditorEnableWikitextBetaFeature' )
),
'svgMaxSize' => $coreConfig->get( 'SVGMaxSize' ),
'namespacesWithSubpages' => $coreConfig->get( 'NamespacesWithSubpages' ),
'specialBooksources' => urldecode( SpecialPage::getTitleFor( 'Booksources' )->getPrefixedURL() ),