jenkins-bot has submitted this change and it was merged.
Change subject: Fix deprecation warnings
......................................................................
Fix deprecation warnings
Will hopefully fix unknown error with banner
rendering in middle of page.
Bug: T114128
Change-Id: If71b039e0472e99744e0e26c543f497461ca764c
---
M ZeroBanner.php
M includes/ZeroSpecialPage.php
M modules/ZeroInfo.js
M modules/ZeroOverlay.js
M modules/banner.js
M modules/interstitial.js
M modules/interstitial.less
7 files changed, 15 insertions(+), 9 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ZeroBanner.php b/ZeroBanner.php
index 52737c6..aba96ec 100644
--- a/ZeroBanner.php
+++ b/ZeroBanner.php
@@ -72,6 +72,8 @@
$wgResourceModules['zerobanner'] = array(
'dependencies' => array(
'mobile.overlays',
+ 'mobile.settings',
+ 'mobile.startup',
'oojs-ui',
'zerobanner.styles'
),
diff --git a/includes/ZeroSpecialPage.php b/includes/ZeroSpecialPage.php
index a907488..263a70f 100644
--- a/includes/ZeroSpecialPage.php
+++ b/includes/ZeroSpecialPage.php
@@ -462,7 +462,7 @@
$cfg = PageRendering::getJsConfigBlock(
$this, $xcs, $config, false );
}
if ( $banner ) {
- $banner = 'document.write(' .
Xml::encodeJsVar( $banner ) . ');';
+ $banner = '$(\'body\').prepend(' .
Xml::encodeJsVar( $banner ) . ');';
}
$banner = $cfg . $banner;
}
@@ -516,7 +516,7 @@
} else {
$response->header( 'Content-type: image/gif' );
}
- echo $banner;
+ echo ResourceLoader::makeInlineScript( $banner );
return true;
}
diff --git a/modules/ZeroInfo.js b/modules/ZeroInfo.js
index 49344b6..8af9cb6 100644
--- a/modules/ZeroInfo.js
+++ b/modules/ZeroInfo.js
@@ -1,8 +1,8 @@
/* global mw, OO, jQuery */
( function( M, $ ) {
'use strict';
- var settings = M.require( 'settings' ),
- router = M.require( 'router' ),
+ var settings = M.require( 'mobile.settings/settings' ),
+ router = M.require( 'mobile.startup/router' ),
ZeroInfo,
windowManager;
diff --git a/modules/ZeroOverlay.js b/modules/ZeroOverlay.js
index 6c10fca..b326e51 100644
--- a/modules/ZeroOverlay.js
+++ b/modules/ZeroOverlay.js
@@ -1,9 +1,9 @@
/* global mw, jQuery */
( function( M, $ ) {
'use strict';
- var settings = M.require( 'settings' ),
- router = M.require( 'router' ),
- ContentOverlay = M.require( 'ContentOverlay' ),
+ var settings = M.require( 'mobile.settings/settings' ),
+ router = M.require( 'mobile.startup/router' ),
+ ContentOverlay = M.require( 'mobile.overlays/ContentOverlay' ),
ZeroOverlay,
cfg = window && window.zeroGlobalConfig || false;
diff --git a/modules/banner.js b/modules/banner.js
index 43fd189..4fbe9a4 100644
--- a/modules/banner.js
+++ b/modules/banner.js
@@ -3,7 +3,7 @@
var m = ( function() {
function initBanner( banner ) {
var cookieNameZeroVisibility = banner.getAttribute(
'id' ),
- settings = M.require('settings'),
+ settings = M.require(
'mobile.settings/settings' ),
saveUserSetting = settings.save,
getUserSetting = settings.get,
visibility,
diff --git a/modules/interstitial.js b/modules/interstitial.js
index 557f487..ce05974 100644
--- a/modules/interstitial.js
+++ b/modules/interstitial.js
@@ -6,7 +6,7 @@
hostname = document.location.hostname.toLowerCase(), //
hostname of the current page
isMdot = hostname.indexOf( '.m.' ) !== -1,
isHttps = window.location.protocol === 'https:',
- settings = M.require('settings'), // module for
reading/writing user settings
+ settings = M.require( 'mobile.settings/settings' ), //
module for reading/writing user settings
// this is set if operator zero-rates HTTPS
supportsTls = config ? config.enabled &&
config.enableHttps : $.cookie( 'ZeroOpts' ) === 'tls',
getConfig = config ? config : ( function () {
diff --git a/modules/interstitial.less b/modules/interstitial.less
index ff5131f..9e01631 100644
--- a/modules/interstitial.less
+++ b/modules/interstitial.less
@@ -31,6 +31,10 @@
.drop-shadow(@y: 4px);
.border-radius(25px);
+ .overlay-header-container, .overlay-footer-container {
+ border: none;
+ }
+
.overlay-content {
height: 100%;
text-align: center;
--
To view, visit https://gerrit.wikimedia.org/r/242661
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If71b039e0472e99744e0e26c543f497461ca764c
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/ZeroBanner
Gerrit-Branch: master
Gerrit-Owner: Jhobs <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: Jhobs <[email protected]>
Gerrit-Reviewer: Yurik <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
