jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: Fix the language sorter mess
......................................................................
Hygiene: Fix the language sorter mess
Only half the code is being run in beta and that code doesn't work without the
profiler.
This feature sets a langMap in localStorage when you interact with items in the
language overlay
I've also clarified when stuff should go in scripts for mobile.beta
Change-Id: I9b791963b2f6e800c455ddbbeb5e4f869565b5e9
---
M includes/Resources.php
R javascripts/modules/preferredLanguages/preferred.js
R javascripts/modules/preferredLanguages/profiler.js
R tests/qunit/modules/preferredLanguages/test_preferred.js
4 files changed, 14 insertions(+), 6 deletions(-)
Approvals:
Jhernandez: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Resources.php b/includes/Resources.php
index 15cd2bc..cb779da 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -462,6 +462,16 @@
),
),
+ 'mobile.preferredLanguages' => $wgMFResourceFileModuleBoilerplate +
array(
+ 'dependencies' => array(
+ 'mobile.startup',
+ ),
+ 'scripts' => array(
+ 'javascripts/modules/preferredLanguages/profiler.js',
+ 'javascripts/modules/preferredLanguages/preferred.js',
+ ),
+ ),
+
'mobile.beta' => $wgMFResourceFileModuleBoilerplate + array(
'dependencies' => array(
'mobile.stable',
@@ -469,9 +479,7 @@
'mobile.overlays',
'mobile.references.beta',
'mobile.wikigrok',
- ),
- 'scripts' => array(
- 'javascripts/modules/languages/preferred.js',
+ 'mobile.preferredLanguages',
),
'position' => 'bottom',
),
@@ -575,9 +583,6 @@
'mobile.alpha' => $wgMFResourceFileModuleBoilerplate + array(
'dependencies' => array(
'mobile.beta',
- ),
- 'scripts' => array(
- 'javascripts/modules/mf-translator.js',
),
),
diff --git a/javascripts/modules/languages/preferred.js
b/javascripts/modules/preferredLanguages/preferred.js
similarity index 85%
rename from javascripts/modules/languages/preferred.js
rename to javascripts/modules/preferredLanguages/preferred.js
index a74e639..04f2c1e 100644
--- a/javascripts/modules/languages/preferred.js
+++ b/javascripts/modules/preferredLanguages/preferred.js
@@ -1,3 +1,4 @@
+// When set orders LanguageOverlay list of languages by most frequently chosen
( function ( M, $ ) {
var langMap = M.settings.getUserSetting( 'langMap' );
langMap = langMap ? $.parseJSON( langMap ) : {};
diff --git a/javascripts/modules/mf-translator.js
b/javascripts/modules/preferredLanguages/profiler.js
similarity index 85%
rename from javascripts/modules/mf-translator.js
rename to javascripts/modules/preferredLanguages/profiler.js
index e653503..519e7c8 100644
--- a/javascripts/modules/mf-translator.js
+++ b/javascripts/modules/preferredLanguages/profiler.js
@@ -1,3 +1,5 @@
+// Watches users use of the language overlay and profiles the languages
+// that user clicks on. Stores this locally under the key langMap
( function ( M ) {
var supported = M.supportsLocalStorage,
diff --git a/tests/qunit/modules/test_mf-translator.js
b/tests/qunit/modules/preferredLanguages/test_preferred.js
similarity index 100%
rename from tests/qunit/modules/test_mf-translator.js
rename to tests/qunit/modules/preferredLanguages/test_preferred.js
--
To view, visit https://gerrit.wikimedia.org/r/171169
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9b791963b2f6e800c455ddbbeb5e4f869565b5e9
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: Awjrichards <aricha...@wikimedia.org>
Gerrit-Reviewer: Bmansurov <bmansu...@wikimedia.org>
Gerrit-Reviewer: Florianschmidtwelzow <florian.schmidt.wel...@t-online.de>
Gerrit-Reviewer: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: Jhernandez <jhernan...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
