jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: Clearly identify when/how things get initialised.
......................................................................
Hygiene: Clearly identify when/how things get initialised.
Change-Id: I5dbf45481676aeb47dcff58bd570c9ab01fcadd9
---
M includes/Resources.php
R javascripts/modules/editor/init.js
R javascripts/modules/issues/init.js
R javascripts/modules/languages/init.js
R javascripts/modules/lastEdited/init.js
A javascripts/modules/preferredLanguages/init.js
D javascripts/modules/preferredLanguages/preferred.js
D javascripts/modules/preferredLanguages/profiler.js
R javascripts/modules/redlinks/init.js
R javascripts/modules/references/init.js
R javascripts/modules/search/init.js
R javascripts/modules/toc/init.js
R javascripts/modules/toggling/init.js
R javascripts/modules/tutorials/init.js
R javascripts/modules/wikigrok/init.js
R tests/qunit/modules/issues/test_init.js
R tests/qunit/modules/preferredLanguages/test_init.js
R tests/qunit/modules/references/test_init.js
R tests/qunit/modules/toggling/test_init.js
19 files changed, 62 insertions(+), 72 deletions(-)
Approvals:
Robmoen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Resources.php b/includes/Resources.php
index e02179f..cabbd84 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -109,7 +109,7 @@
'mobile.toggling',
),
'scripts' => array(
- 'javascripts/modules/toc/toc.js',
+ 'javascripts/modules/toc/init.js',
),
'styles' => array(
'less/modules/toc/toc.less',
@@ -177,7 +177,7 @@
'mediawiki.user',
),
'scripts' => array(
- 'javascripts/modules/redlinks/redlinks.js',
+ 'javascripts/modules/redlinks/init.js',
),
),
@@ -212,7 +212,7 @@
'mobile-frontend-editor-edit',
),
'scripts' => array(
- 'javascripts/modules/editor/editor.js',
+ 'javascripts/modules/editor/init.js',
),
),
@@ -430,8 +430,7 @@
'mobile.settings',
),
'scripts' => array(
- 'javascripts/modules/preferredLanguages/profiler.js',
- 'javascripts/modules/preferredLanguages/preferred.js',
+ 'javascripts/modules/preferredLanguages/init.js',
),
),
@@ -449,7 +448,7 @@
'scripts' => array(
'javascripts/modules/search/SearchApi.js',
'javascripts/modules/search/SearchOverlay.js',
- 'javascripts/modules/search/search.js',
+ 'javascripts/modules/search/init.js',
),
'templates' => array(
'SearchOverlay.hogan' =>
'templates/modules/search/SearchOverlay.hogan',
@@ -571,7 +570,7 @@
'mobile.loggingSchemas',
),
'scripts' => array(
- 'javascripts/modules/wikigrok/wikigrok.js',
+ 'javascripts/modules/wikigrok/init.js',
),
),
@@ -721,7 +720,7 @@
),
'scripts' => array(
'javascripts/modules/references/ReferencesDrawer.js',
- 'javascripts/modules/references/references.js',
+ 'javascripts/modules/references/init.js',
),
),
@@ -734,7 +733,7 @@
'less/modules/toggle.less',
),
'scripts' => array(
- 'javascripts/modules/toggling/toggle.js',
+ 'javascripts/modules/toggling/init.js',
),
),
@@ -766,7 +765,7 @@
'mobile.loggingSchemas',
),
'scripts' => array(
- 'javascripts/modules/tutorials/newbieEditor.js',
+ 'javascripts/modules/tutorials/init.js',
),
'messages' => array(
// newbieEditor.js
@@ -835,7 +834,7 @@
),
'scripts' => array(
'javascripts/modules/issues/CleanupOverlay.js',
- 'javascripts/modules/issues/issues.js',
+ 'javascripts/modules/issues/init.js',
),
'messages' => array(
// issues.js
@@ -1177,7 +1176,7 @@
'javascripts/modes.js',
'javascripts/mainmenu.js',
'javascripts/modules/lastEdited/time.js',
- 'javascripts/modules/lastEdited/lastEdited.js',
+ 'javascripts/modules/lastEdited/init.js',
),
'messages' => array(
// lastEdited.js
@@ -1218,7 +1217,7 @@
'javascripts/modules/uploads/init.js',
'javascripts/modules/mainmenutweaks.js',
'javascripts/modules/mediaViewer/init.js',
- 'javascripts/modules/languages/languages.js',
+ 'javascripts/modules/languages/init.js',
),
),
'mobile.beta' => $wgMFResourceFileModuleBoilerplate + array(
diff --git a/javascripts/modules/editor/editor.js
b/javascripts/modules/editor/init.js
similarity index 100%
rename from javascripts/modules/editor/editor.js
rename to javascripts/modules/editor/init.js
diff --git a/javascripts/modules/issues/issues.js
b/javascripts/modules/issues/init.js
similarity index 100%
rename from javascripts/modules/issues/issues.js
rename to javascripts/modules/issues/init.js
diff --git a/javascripts/modules/languages/languages.js
b/javascripts/modules/languages/init.js
similarity index 100%
rename from javascripts/modules/languages/languages.js
rename to javascripts/modules/languages/init.js
diff --git a/javascripts/modules/lastEdited/lastEdited.js
b/javascripts/modules/lastEdited/init.js
similarity index 100%
rename from javascripts/modules/lastEdited/lastEdited.js
rename to javascripts/modules/lastEdited/init.js
diff --git a/javascripts/modules/preferredLanguages/init.js
b/javascripts/modules/preferredLanguages/init.js
new file mode 100644
index 0000000..e81e0f1
--- /dev/null
+++ b/javascripts/modules/preferredLanguages/init.js
@@ -0,0 +1,50 @@
+// When set orders LanguageOverlay list of languages by most frequently chosen
+( function ( M, $ ) {
+ var supported = M.supportsLocalStorage,
+ settings = M.require( 'settings' ),
+ langMap = settings.get( 'langMap' ),
+ curLanguage = mw.config.get( 'wgContentLanguage' );
+
+ langMap = langMap ? $.parseJSON( langMap ) : {};
+
+ function loadLanguageMap() {
+ langMap = settings.get( 'langMap' );
+ langMap = langMap ? JSON.parse( langMap ) : {};
+ }
+
+ function profileLanguage( language ) {
+ // if not supported, don't do anything
+ if ( supported && langMap ) {
+ var count;
+ count = langMap[ language ] || 0;
+ count += 1;
+ // cap at 100 as this is enough data to work on
+ langMap[ language ] = count > 100 ? 100 : count;
+ settings.save( 'langMap', JSON.stringify( langMap ) );
+ }
+ }
+
+ function initProfiler() {
+ if ( supported ) {
+ loadLanguageMap();
+ profileLanguage( curLanguage );
+ }
+ }
+
+ M.on( 'language-overlay-initialize', function ( options ) {
+ options.languages = options.languages.sort( function ( a, b ) {
+ var x = langMap[ a.lang ] || 0,
+ y = langMap[ b.lang ] || 0;
+ if ( x > 0 ) {
+ a.preferred = true;
+ }
+ if ( y > 0 ) {
+ b.preferred = true;
+ }
+ return x < y;
+ } );
+ } );
+ M.on( 'language-select', profileLanguage );
+ initProfiler();
+
+}( mw.mobileFrontend, jQuery ) );
diff --git a/javascripts/modules/preferredLanguages/preferred.js
b/javascripts/modules/preferredLanguages/preferred.js
deleted file mode 100644
index 4a89b44..0000000
--- a/javascripts/modules/preferredLanguages/preferred.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// When set orders LanguageOverlay list of languages by most frequently chosen
-( function ( M, $ ) {
- var settings = M.require( 'settings' ),
- langMap = settings.get( 'langMap' );
-
- langMap = langMap ? $.parseJSON( langMap ) : {};
-
- M.on( 'language-overlay-initialize', function ( options ) {
- options.languages = options.languages.sort( function ( a, b ) {
- var x = langMap[ a.lang ] || 0,
- y = langMap[ b.lang ] || 0;
- if ( x > 0 ) {
- a.preferred = true;
- }
- if ( y > 0 ) {
- b.preferred = true;
- }
- return x < y;
- } );
- } );
-
-}( mw.mobileFrontend, jQuery ) );
diff --git a/javascripts/modules/preferredLanguages/profiler.js
b/javascripts/modules/preferredLanguages/profiler.js
deleted file mode 100644
index e6ee671..0000000
--- a/javascripts/modules/preferredLanguages/profiler.js
+++ /dev/null
@@ -1,37 +0,0 @@
-// 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,
- settings = M.require( 'settings' ),
- langMap,
- curLanguage = mw.config.get( 'wgContentLanguage' );
-
- function loadLanguageMap() {
- langMap = settings.get( 'langMap' );
- langMap = langMap ? JSON.parse( langMap ) : {};
- }
-
- function profileLanguage( language ) {
- // if not supported, don't do anything
- if ( supported && langMap ) {
- var count;
- count = langMap[ language ] || 0;
- count += 1;
- // cap at 100 as this is enough data to work on
- langMap[ language ] = count > 100 ? 100 : count;
- settings.save( 'langMap', JSON.stringify( langMap ) );
- }
- }
-
- function initProfiler() {
- if ( supported ) {
- loadLanguageMap();
- profileLanguage( curLanguage );
- }
- }
-
- M.on( 'language-select', profileLanguage );
- initProfiler();
-
-}( mw.mobileFrontend ) );
diff --git a/javascripts/modules/redlinks/redlinks.js
b/javascripts/modules/redlinks/init.js
similarity index 100%
rename from javascripts/modules/redlinks/redlinks.js
rename to javascripts/modules/redlinks/init.js
diff --git a/javascripts/modules/references/references.js
b/javascripts/modules/references/init.js
similarity index 100%
rename from javascripts/modules/references/references.js
rename to javascripts/modules/references/init.js
diff --git a/javascripts/modules/search/search.js
b/javascripts/modules/search/init.js
similarity index 100%
rename from javascripts/modules/search/search.js
rename to javascripts/modules/search/init.js
diff --git a/javascripts/modules/toc/toc.js b/javascripts/modules/toc/init.js
similarity index 100%
rename from javascripts/modules/toc/toc.js
rename to javascripts/modules/toc/init.js
diff --git a/javascripts/modules/toggling/toggle.js
b/javascripts/modules/toggling/init.js
similarity index 100%
rename from javascripts/modules/toggling/toggle.js
rename to javascripts/modules/toggling/init.js
diff --git a/javascripts/modules/tutorials/newbieEditor.js
b/javascripts/modules/tutorials/init.js
similarity index 100%
rename from javascripts/modules/tutorials/newbieEditor.js
rename to javascripts/modules/tutorials/init.js
diff --git a/javascripts/modules/wikigrok/wikigrok.js
b/javascripts/modules/wikigrok/init.js
similarity index 100%
rename from javascripts/modules/wikigrok/wikigrok.js
rename to javascripts/modules/wikigrok/init.js
diff --git a/tests/qunit/modules/issues/test_issues.js
b/tests/qunit/modules/issues/test_init.js
similarity index 100%
rename from tests/qunit/modules/issues/test_issues.js
rename to tests/qunit/modules/issues/test_init.js
diff --git a/tests/qunit/modules/preferredLanguages/test_preferred.js
b/tests/qunit/modules/preferredLanguages/test_init.js
similarity index 100%
rename from tests/qunit/modules/preferredLanguages/test_preferred.js
rename to tests/qunit/modules/preferredLanguages/test_init.js
diff --git a/tests/qunit/modules/references/test_references.js
b/tests/qunit/modules/references/test_init.js
similarity index 100%
rename from tests/qunit/modules/references/test_references.js
rename to tests/qunit/modules/references/test_init.js
diff --git a/tests/qunit/modules/toggling/test_toggle.js
b/tests/qunit/modules/toggling/test_init.js
similarity index 100%
rename from tests/qunit/modules/toggling/test_toggle.js
rename to tests/qunit/modules/toggling/test_init.js
--
To view, visit https://gerrit.wikimedia.org/r/172457
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5dbf45481676aeb47dcff58bd570c9ab01fcadd9
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
Gerrit-Reviewer: Awjrichards <[email protected]>
Gerrit-Reviewer: Bmansurov <[email protected]>
Gerrit-Reviewer: Robmoen <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
