Jforrester has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/257800

Change subject: Add config for wgVisualEditorUseSingleEditTab and set true for 
enwiki Labs
......................................................................

Add config for wgVisualEditorUseSingleEditTab and set true for enwiki Labs

Change-Id: I749f611d714fa9b764c0d422945e097150b6c774
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings-labs.php
M wmf-config/InitialiseSettings.php
3 files changed, 36 insertions(+), 23 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/00/257800/1

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index fbedeeb..20aa3c4 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1990,6 +1990,20 @@
                };
        }
 
+       // Tab configuration
+       if ( $wmgVisualEditorUseSingleEditTab ) {
+               $wgVisualEditorUseSingleEditTab = true;
+       } else {
+               if ( $wmgVisualEditorSecondaryTabs ) {
+                       $wgVisualEditorTabPosition = 'after';
+               }
+               if ( $wmgVisualEditorBetaInTab ) {
+                       $wgVisualEditorTabMessages['editappendix'] =
+                               $wgVisualEditorTabMessages['createappendix'] =
+                               
$wgVisualEditorTabMessages['editsectionappendix'] = 
'visualeditor-beta-appendix';
+               }
+       }
+
        // Namespace configuration
        $wgVisualEditorAvailableNamespaces = 
$wmgVisualEditorAvailableNamespaces;
        if ( !isset( $wgVisualEditorAvailableNamespaces ) ) {
@@ -2010,16 +2024,6 @@
        // T52000 - to remove once roll-out is complete.
        if ( $wmgVisualEditorDisableForAnons ) {
                $wgVisualEditorDisableForAnons = true;
-       }
-
-       // Tab configuration
-       if ( $wmgVisualEditorSecondaryTabs ) {
-               $wgVisualEditorTabPosition = 'after';
-       }
-       if ( $wmgVisualEditorBetaInTab ) {
-               $wgVisualEditorTabMessages['editappendix'] =
-                       $wgVisualEditorTabMessages['createappendix'] =
-                       $wgVisualEditorTabMessages['editsectionappendix'] = 
'visualeditor-beta-appendix';
        }
 
        // Welcome configuration
diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index 2bef076..44aca49 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -361,6 +361,10 @@
                        'default' => true,
                ),
 
+               'wmgVisualEditorUseSingleEditTab' => array(
+                       'default' => false,
+                       'enwiki' => true,
+               ),
                'wmgVisualEditorExperimental' => array(
                        'default' => true,
                ),
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 8bc8196..6a4bc48 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12820,6 +12820,24 @@
        'private' => false,             # Private wikis aren't yet supported by 
RESTbase
 ),
 
+// Whether VisualEditor should re-use the edit tab (and section link) or 
insert its own
+'wmgVisualEditorUseSingleEditTab' => array(
+       'default' => false,             # Deploying slowly with community 
advanced notice
+),
+
+// Whether VisualEditor's second tab and section link come after those for 
wikitext
+'wmgVisualEditorSecondaryTabs' => array(
+       'default' => false,
+       'enwiki' => true,
+       'eswiki' => true, // T62188
+       'hewiki' => true, // T54552
+),
+
+// Whether VisualEditor's second tab and section link have a "beta" 
superscript note?
+'wmgVisualEditorBetaInTab' => array(
+       'default' => false,
+),
+
 // Namespaces for VisualEditor to be active in, as well as wgContentNamespaces
 'wmgVisualEditorAvailableNamespaces' => array(
        'default' => array(
@@ -12975,19 +12993,6 @@
 // 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,
-       'eswiki' => true, // T62188
-       'hewiki' => true, // T54552
-),
-
-// Should VisualEditor's tab and section link have a "beta" superscript note?
-'wmgVisualEditorBetaInTab' => array(
-       'default' => false,
 ),
 
 // Should VisualEditor display a live version of the Table of Contents as you 
edit

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I749f611d714fa9b764c0d422945e097150b6c774
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jforrester <[email protected]>

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

Reply via email to