Merge "Collapse amboxes in edit view"

This commit is contained in:
jenkins-bot 2017-09-28 16:11:43 +00:00 committed by Gerrit Code Review
commit 9bb62a254d
2 changed files with 11 additions and 4 deletions

View File

@ -1,7 +1,8 @@
( function ( M, $ ) { ( function ( M, $ ) {
( function () { ( function () {
var overlayManager = M.require( 'skins.minerva.scripts/overlayManager' ), var action = mw.config.get( 'wgAction' ),
overlayManager = M.require( 'skins.minerva.scripts/overlayManager' ),
CleanupOverlay = M.require( 'mobile.issues/CleanupOverlay' ); CleanupOverlay = M.require( 'mobile.issues/CleanupOverlay' );
/** /**
@ -50,7 +51,7 @@
* @ignore * @ignore
*/ */
function createBanner( $container, labelText, headingText ) { function createBanner( $container, labelText, headingText ) {
var selector = 'table.ambox, table.tmbox, table.cmbox', var selector = 'table.ambox, table.tmbox, table.cmbox, table.fmbox',
$metadata = $container.find( selector ), $metadata = $container.find( selector ),
issues = [], issues = [],
$link; $link;
@ -100,11 +101,16 @@
$container = ns === 14 ? $( '#bodyContent' ) : $container = ns === 14 ? $( '#bodyContent' ) :
M.getCurrentPage().getLeadSectionElement(); M.getCurrentPage().getLeadSectionElement();
if ( $container === null ) { if ( action === 'edit' ) {
$container = $( '#mw-content-text' );
} else if ( $container === null ) {
return; return;
} }
if ( ns === 0 ) { if ( action === 'edit' ) {
createBanner( $container, mw.msg( 'edithelp' ),
mw.msg( 'edithelp' ) );
} else if ( ns === 0 ) {
createBanner( $container, mw.msg( 'mobile-frontend-meta-data-issues' ), createBanner( $container, mw.msg( 'mobile-frontend-meta-data-issues' ),
mw.msg( 'mobile-frontend-meta-data-issues-header' ) ); mw.msg( 'mobile-frontend-meta-data-issues-header' ) );
// Create a banner for talk pages (namespace 1) in beta mode to make them more readable. // Create a banner for talk pages (namespace 1) in beta mode to make them more readable.

View File

@ -265,6 +265,7 @@
"mobile.betaoptin" "mobile.betaoptin"
], ],
"messages": [ "messages": [
"edithelp",
"mobile-frontend-language-change", "mobile-frontend-language-change",
"mobile-frontend-meta-data-issues", "mobile-frontend-meta-data-issues",
"mobile-frontend-meta-data-issues-talk", "mobile-frontend-meta-data-issues-talk",