jenkins-bot has submitted this change and it was merged.
Change subject: Regression: Make languages work again on beta
......................................................................
Regression: Make languages work again on beta
Moving dynamic page loads from beta to alpha reveals a problem in
code
Also make the languages button show when only one language is
present (assume that the current language is not in that list)
Change-Id: I344ec10e04e93de14f7a2798104b59181e8e5205
---
M javascripts/modules/mf-languages.js
1 file changed, 4 insertions(+), 9 deletions(-)
Approvals:
JGonera: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/javascripts/modules/mf-languages.js
b/javascripts/modules/mf-languages.js
index 3c17edb..09016f2 100644
--- a/javascripts/modules/mf-languages.js
+++ b/javascripts/modules/mf-languages.js
@@ -1,6 +1,5 @@
( function( M, $ ) {
-var m = ( function() {
var createOverlay = M.require( 'navigation' ).createOverlay;
function countAvailableLanguages() {
@@ -56,7 +55,7 @@
var $a = $( '#mw-mf-language-section' ),
$h2 = $a.find( 'h2' );
- if( countAvailableLanguages() > 1 ) {
+ if ( countAvailableLanguages() > 0 ) { // assume the current
language is not present
$h2.find( 'button' ).remove();
$( '<button>' ).text( $h2.text() ).
addClass( 'languageSelector' ).
@@ -65,7 +64,9 @@
$a.hide();
}
- function init() {
+ if ( !M.history.isDynamicPageLoadEnabled ) {
+ initButton();
+ } else {
M.on( 'history-change', function( curPage ) {
if ( curPage.hash === '#mw-mf-overlay-language' ) {
createLanguagePage();
@@ -75,10 +76,4 @@
} );
}
- return {
- init: init
- };
-}() );
-
-M.define( 'languages', m );
}( mw.mobileFrontend, jQuery ) );
--
To view, visit https://gerrit.wikimedia.org/r/52158
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I344ec10e04e93de14f7a2798104b59181e8e5205
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
Gerrit-Reviewer: JGonera <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: awjrichards <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
