jenkins-bot has submitted this change and it was merged.

Change subject: Clean up how VisualEditor is configured
......................................................................


Clean up how VisualEditor is configured

Add some comments, split out the beta superscript from the primary vs.
secondary setting.

Change-Id: I04661aeaeea2d082e11209628921b1dfb0628fba
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 15 insertions(+), 1 deletion(-)

Approvals:
  Reedy: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 0281528..647400e 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1895,8 +1895,10 @@
        if ( $wmgVisualEditorShowBetaWelcome ) {
                $wgVisualEditorShowBetaWelcome = true;
        }
-       if ( $wmgVisualEditorBetaInTab ) {
+       if ( $wmgVisualEditorSecondaryTabs ) {
                $wgVisualEditorTabPosition = 'after';
+       }
+       if ( $wmgVisualEditorBetaInTab ) {
                $wgVisualEditorTabMessages['editappendix'] =
                        $wgVisualEditorTabMessages['createappendix'] =
                        $wgVisualEditorTabMessages['editsectionappendix'] = 
'visualeditor-beta-appendix';
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 2114646..0351407 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -10569,6 +10569,8 @@
        'enwiki' => 800, // beta testing -- Kaldari 2013-05-30
 ),
 
+// -------------- VisualEditor start --------------
+
 'wmgUseVisualEditor' => array(
        'default' => false,
        'visualeditor' => true,
@@ -10650,15 +10652,25 @@
        'enwiki' => true,
 ),
 
+// Should VisualEditor's "beta welcome" be shown
 'wmgVisualEditorShowBetaWelcome' => array(
        'default' => true,
 ),
 
+// Should VisualEditor's tab and section link come second behind those for 
wikitext?
+'wmgVisualEditorSecondaryTabs' => array(
+       'default' => false,
+       'enwiki' => true,
+),
+
+// Should VisualEditor's tab and section link have a "beta" superscript note?
 'wmgVisualEditorBetaInTab' => array(
        'default' => false,
        'enwiki' => true,
 ),
 
+// --------------- VisualEditor end ---------------
+
 'wmgUseRSSExtension' => array(
        'default' => false,
        'foundationwiki' => true,

-- 
To view, visit https://gerrit.wikimedia.org/r/87644
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I04661aeaeea2d082e11209628921b1dfb0628fba
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jforrester <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to