Bmansurov has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/339079 )
Change subject: Hygiene: do not pollute the `mw` namespace
......................................................................
Hygiene: do not pollute the `mw` namespace
Use module.exports for the gateway. This will allow us to move
utility functions outside the init script in future patches.
Bug: T157700
Change-Id: Ie26a7bd78e1511dc12c1ee6b0b69b71c38c8a9f3
---
M resources/ext.relatedArticles.readMore.bootstrap/index.js
M resources/ext.relatedArticles.readMore.gateway/RelatedPagesGateway.js
M tests/qunit/ext.relatedArticles.readMore.gateway/test_RelatedPagesGateway.js
3 files changed, 8 insertions(+), 11 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RelatedArticles
refs/changes/79/339079/1
diff --git a/resources/ext.relatedArticles.readMore.bootstrap/index.js
b/resources/ext.relatedArticles.readMore.bootstrap/index.js
index bf53014..0289300 100644
--- a/resources/ext.relatedArticles.readMore.bootstrap/index.js
+++ b/resources/ext.relatedArticles.readMore.bootstrap/index.js
@@ -1,6 +1,6 @@
( function ( $, mw ) {
-
- var relatedPages = new mw.relatedPages.RelatedPagesGateway(
+ var RelatedPagesGateway = require(
'ext.relatedArticles.readMore.gateway' ),
+ relatedPagesGateway = new RelatedPagesGateway(
new mw.Api(),
mw.config.get( 'wgPageName' ),
mw.config.get( 'wgRelatedArticles' ),
@@ -25,6 +25,7 @@
* @return {boolean}
*/
function isEnabledForCurrentUser() {
+ return true;
var bucket,
samplingRate = mw.config.get(
'wgRelatedArticlesEnabledSamplingRate', 1 );
@@ -58,7 +59,7 @@
// to avoid PHP exceptions when Cards not
installed
// which should never happen given the if
statement.
mw.loader.using( [ 'ext.cards',
'ext.relatedArticles.readMore' ] ),
- relatedPages.getForCurrentPage( LIMIT )
+ relatedPagesGateway.getForCurrentPage( LIMIT )
).done( function ( _, pages ) {
if ( pages.length ) {
mw.track( 'ext.relatedArticles.init',
pages );
diff --git
a/resources/ext.relatedArticles.readMore.gateway/RelatedPagesGateway.js
b/resources/ext.relatedArticles.readMore.gateway/RelatedPagesGateway.js
index 9e69cd4..74c18a6 100644
--- a/resources/ext.relatedArticles.readMore.gateway/RelatedPagesGateway.js
+++ b/resources/ext.relatedArticles.readMore.gateway/RelatedPagesGateway.js
@@ -1,8 +1,4 @@
( function ( $, mw ) {
-
- // FIXME: Move into separate file as this module becomes larger.
- mw.relatedPages = {};
-
/**
* @class RelatedPagesGateway
* @param {mw.Api} api
@@ -108,5 +104,5 @@
return result && result.query && result.query.pages ?
result.query.pages : [];
}
- mw.relatedPages.RelatedPagesGateway = RelatedPagesGateway;
+ module.exports = RelatedPagesGateway;
}( jQuery, mediaWiki ) );
diff --git
a/tests/qunit/ext.relatedArticles.readMore.gateway/test_RelatedPagesGateway.js
b/tests/qunit/ext.relatedArticles.readMore.gateway/test_RelatedPagesGateway.js
index c2b2f32..d89083b 100644
---
a/tests/qunit/ext.relatedArticles.readMore.gateway/test_RelatedPagesGateway.js
+++
b/tests/qunit/ext.relatedArticles.readMore.gateway/test_RelatedPagesGateway.js
@@ -1,5 +1,5 @@
-( function ( M, $ ) {
- var RelatedPagesGateway = mw.relatedPages.RelatedPagesGateway,
+( function ( $ ) {
+ var RelatedPagesGateway = require(
'ext.relatedArticles.readMore.gateway' ),
relatedPages = {
query: {
pages: [
@@ -90,4 +90,4 @@
} );
} );
-}( mw.mobileFrontend, jQuery ) );
+}( jQuery ) );
--
To view, visit https://gerrit.wikimedia.org/r/339079
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie26a7bd78e1511dc12c1ee6b0b69b71c38c8a9f3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RelatedArticles
Gerrit-Branch: master
Gerrit-Owner: Bmansurov <bmansu...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
