Jdlrobson has submitted this change and it was merged.
Change subject: Device-specific styles should be last in the list
......................................................................
Device-specific styles should be last in the list
Change-Id: I35a2a18978bf5c0965379e204641da910317d525
---
M MobileFrontend.php
M includes/skins/SkinMobile.php
2 files changed, 5 insertions(+), 4 deletions(-)
Approvals:
Jdlrobson: Verified; Looks good to me, approved
diff --git a/MobileFrontend.php b/MobileFrontend.php
index fe85dd4..0282fe1 100644
--- a/MobileFrontend.php
+++ b/MobileFrontend.php
@@ -651,11 +651,12 @@
'position' => 'top',
);
-$wgResourceModules['mobile.device.detect.styles'] =
$wgMFMobileResourceBoilerplate + array(
+//@hack: xdevice instead of device to force this module to be last in a link
+$wgResourceModules['mobile.xdevice.detect.styles'] =
$wgMFMobileResourceBoilerplate + array(
'class' => 'MobileDeviceDetectStylesModule',
);
-$wgResourceModules['mobile.device.detect.scripts'] =
$wgMFMobileResourceBoilerplate + array(
+$wgResourceModules['mobile.xdevice.detect.scripts'] =
$wgMFMobileResourceBoilerplate + array(
'class' => 'MobileDeviceDetectScriptsModule',
);
diff --git a/includes/skins/SkinMobile.php b/includes/skins/SkinMobile.php
index 8d9639c..27ab4ef 100644
--- a/includes/skins/SkinMobile.php
+++ b/includes/skins/SkinMobile.php
@@ -231,8 +231,8 @@
// add device specific css file - add separately to avoid cache
fragmentation
if ( $wgMFVaryResources ) {
- $out->addModuleStyles( 'mobile.device.detect.styles' );
- $out->addModules( 'mobile.device.detect.scripts' );
+ $out->addModuleStyles( 'mobile.xdevice.detect.styles' );
+ $out->addModules( 'mobile.xdevice.detect.scripts' );
} elseif ( $device->moduleName() ) {
$out->addModuleStyles( $device->moduleName() );
}
--
To view, visit https://gerrit.wikimedia.org/r/59157
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I35a2a18978bf5c0965379e204641da910317d525
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: MaxSem <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
