Merge "installer: Do not wrongly hide namespace input field"

diff --git a/includes/installer/WebInstallerName.php b/includes/installer/WebInstallerName.php
index 81a107d..50c88ae 100644 (file)
--- a/includes/installer/WebInstallerName.php
+++ b/includes/installer/WebInstallerName.php
@@ -76,7 +76,7 @@ class WebInstallerName extends WebInstallerPage {
                        $this->parent->getTextBox( [
                                'var' => 'wgMetaNamespace',
                                'label' => '', // @todo Needs a label?
-                               'attribs' => [ 'readonly' => 'readonly', 'class' => 'enabledByOther' ]
+                               'attribs' => [ 'class' => 'enabledByOther' ]
                        ] ) .
                        $this->getFieldsetStart( 'config-admin-box' ) .
                        $this->parent->getTextBox( [

diff --git a/mw-config/config.js b/mw-config/config.js
index bb62067..99290f4 100644 (file)
--- a/mw-config/config.js
+++ b/mw-config/config.js
@@ -73,7 +73,9 @@
 
                // Hide "other" textboxes by default
                // Should not be done in CSS for javascript disabled compatibility
-               $( '.enabledByOther' ).closest( '.config-block' ).hide();
+               if ( !$( '#config__NamespaceType_other' ).is( ':checked' ) ) {
+                       $( '.enabledByOther' ).closest( '.config-block' ).hide();
+               }
 
                // Enable/disable "other" textboxes
                $( '.enableForOther' ).click( function () {