Jdlrobson has uploaded a new change for review. https://gerrit.wikimedia.org/r/54988
Change subject: Send mobile device in banner query ...................................................................... Send mobile device in banner query Note: I've removed the escape statement - currently the siteNotice div will be hidden by a MobileFrontend config variable so isn't needed Depends on https://gerrit.wikimedia.org/r/54987 (do not merge till this is merged) Change-Id: Icf92e3acfff5df71c9184d31503c1edef8265d7a --- M modules/ext.centralNotice.bannerController/bannerController.js 1 file changed, 2 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice refs/changes/88/54988/1 diff --git a/modules/ext.centralNotice.bannerController/bannerController.js b/modules/ext.centralNotice.bannerController/bannerController.js index c50aafa..a06db06 100644 --- a/modules/ext.centralNotice.bannerController/bannerController.js +++ b/modules/ext.centralNotice.bannerController/bannerController.js @@ -46,7 +46,7 @@ db: mw.config.get( 'wgDBname' ), sitename: mw.config.get( 'wgSiteName' ), country: mw.centralNotice.data.country, - device: mw.config.get( 'wgMobileDeviceName', 'desktop' ) + device: window.getMobileDevice ? window.getMobileDevice() : 'device' }; scriptUrl = mw.config.get( 'wgCentralPagePath' ) + '?' + $.param( bannerPageQuery ); bannerScript = '<script src="' + mw.html.escape( scriptUrl ) + '"></script>'; @@ -55,11 +55,6 @@ loadRandomBanner: function () { var RAND_MAX = 30; - // TODO: Get rid of this when mobile support in CN is totally there - if ( mw.config.get( 'wgMobileDeviceName' ) ) { - return; - } - var bannerDispatchQuery = { userlang: mw.config.get( 'wgUserLanguage' ), sitename: mw.config.get( 'wgSiteName' ), @@ -67,7 +62,7 @@ anonymous: mw.config.get( 'wgUserName' ) === null, bucket: mw.centralNotice.data.bucket, country: mw.centralNotice.data.country, - device: mw.config.get( 'wgMobileDeviceName', 'desktop' ), + device: window.getMobileDevice ? window.getMobileDevice() : 'device', slot: Math.floor( Math.random() * RAND_MAX ) + 1 }; var scriptUrl = mw.config.get( 'wgCentralBannerDispatcher' ) -- To view, visit https://gerrit.wikimedia.org/r/54988 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icf92e3acfff5df71c9184d31503c1edef8265d7a 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
