Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/213989
Change subject: Simplify selection of random banner
......................................................................
Simplify selection of random banner
Change-Id: Ie342894321cae66e9934474f209b94944fa1af29
---
M modules/ext.centralNotice.bannerController/bannerController.js
M modules/ext.centralNotice.bannerController/bannerController.lib.js
2 files changed, 4 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice
refs/changes/89/213989/1
diff --git a/modules/ext.centralNotice.bannerController/bannerController.js
b/modules/ext.centralNotice.bannerController/bannerController.js
index db46321..968b940 100644
--- a/modules/ext.centralNotice.bannerController/bannerController.js
+++ b/modules/ext.centralNotice.bannerController/bannerController.js
@@ -166,7 +166,7 @@
var fetchBannerQueryParams,
scriptUrl;
- this.chooseRandomBanner();
+ this.data.banner = this.chooseRandomBanner();
if ( this.data.banner ) {
@@ -278,7 +278,8 @@
randomBanner =
this.data.getVars.randombanner || Math.random();
- mw.cnBannerControllerLib.chooseBanner( randomBanner );
+ randomBanner = mw.cnBannerControllerLib.chooseBanner(
randomBanner );
+ return randomBanner;
},
// TODO: move function definitions once controller cache has
cleared
insertBanner: function( bannerJson ) {
diff --git a/modules/ext.centralNotice.bannerController/bannerController.lib.js
b/modules/ext.centralNotice.bannerController/bannerController.lib.js
index 98bf917..29e150c 100644
--- a/modules/ext.centralNotice.bannerController/bannerController.lib.js
+++ b/modules/ext.centralNotice.bannerController/bannerController.lib.js
@@ -1,6 +1,5 @@
( function ( $, mw ) {
-
/**
* Method used for choosing a campaign or banner from an array of
* allocated campaigns or banners.
@@ -552,15 +551,7 @@
chooseBanner: function( random ) {
// Since we never have an allocation gap for banners,
this should
// always work.
- this.setBanner(
- chooseObjInAllocatedArray( random,
this.possibleBanners ) );
- },
-
- /**
- * Set the banner (should never be null).
- */
- setBanner: function( banner ) {
- mw.centralNotice.data.banner = banner.name;
+ return chooseObjInAllocatedArray( random,
this.possibleBanners );
}
};
--
To view, visit https://gerrit.wikimedia.org/r/213989
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie342894321cae66e9934474f209b94944fa1af29
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
