From b478393e5ee983d31e18feee691da406a6ffb033 Mon Sep 17 00:00:00 2001 From: jdlrobson Date: Thu, 3 Aug 2017 15:44:17 -0700 Subject: [PATCH] Hygiene: The main page check is not necessary The main page in the Minerva skin is not editable so this code is just cruft. T89559 no longer applies. Change-Id: Ifcd30be0d4e328b056cc7fcfb714c9783b62c913 --- resources/skins.minerva.editor/init.js | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/resources/skins.minerva.editor/init.js b/resources/skins.minerva.editor/init.js index 675b94bfb..c6b5b6d77 100644 --- a/resources/skins.minerva.editor/init.js +++ b/resources/skins.minerva.editor/init.js @@ -249,8 +249,7 @@ if ( $caEdit.find( '.edit-page' ).length === 0 ) { $( '.nojs-edit' ).removeClass( 'nojs-edit' ); $( '#ca-edit a' ).remove(); - // FIXME: unfortunately the main page is special cased. - if ( mw.config.get( 'wgIsMainPage' ) || isNewPage || + if ( isNewPage || ( leadSection && leadSection.text() ) || page.getSections().length === 0 ) { // if lead section is not empty, open editor with lead section // In some namespaces (controlled by MFNamespacesWithoutCollapsibleSections) @@ -262,10 +261,8 @@ } } - // enable all edit pencils in sub-sections for the article namespace except for the main - // page, the pencils are unstyled there, see bug T89559 - // FIXME: Merge this with the line under it after main page special handling is killed - if ( !mw.config.get( 'wgIsMainPage' ) && currentPage.getNamespaceId() === 0 ) { + // enable all edit pencils in sub-sections for the article namespace + if ( currentPage.getNamespaceId() === 0 ) { $( '.in-block>.edit-page' ).show(); } $( '.edit-page' ).on( 'click', function ( ev ) {