Jdlrobson has uploaded a new change for review. https://gerrit.wikimedia.org/r/61989
Change subject: Bug 47586: Remove DeviceDetection js ...................................................................... Bug 47586: Remove DeviceDetection js Move it to CentralNotice instead See https://gerrit.wikimedia.org/r/61988 Change-Id: If219c84d4755697ab849cfc083fa9234382f30f6 --- M MobileFrontend.php M includes/modules/MobileDeviceDetectModule.php 2 files changed, 1 insertion(+), 16 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/89/61989/1 diff --git a/MobileFrontend.php b/MobileFrontend.php index fe988cd..d389148 100644 --- a/MobileFrontend.php +++ b/MobileFrontend.php @@ -51,8 +51,6 @@ 'MFResourceLoaderModule' => 'modules/MFResourceLoaderModule', 'MobileSiteModule' => 'modules/MobileSiteModule', 'MobileDeviceDetectModule' => 'modules/MobileDeviceDetectModule', - 'MobileDeviceDetectScriptsModule' => 'modules/MobileDeviceDetectModule', - 'MobileDeviceDetectStylesModule' => 'modules/MobileDeviceDetectModule', 'SpecialUploads' => 'specials/SpecialUploads', 'SpecialMobileDiff' => 'specials/SpecialMobileDiff', @@ -701,11 +699,7 @@ //@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.xdevice.detect.scripts'] = $wgMFMobileResourceBoilerplate + array( - 'class' => 'MobileDeviceDetectScriptsModule', + 'class' => 'MobileDeviceDetectModule', ); /** diff --git a/includes/modules/MobileDeviceDetectModule.php b/includes/modules/MobileDeviceDetectModule.php index 0fc797e..90680e4 100644 --- a/includes/modules/MobileDeviceDetectModule.php +++ b/includes/modules/MobileDeviceDetectModule.php @@ -20,16 +20,7 @@ } } } -} -class MobileDeviceDetectScriptsModule extends MobileDeviceDetectModule { - public function getScript( ResourceLoaderContext $context ) { - $this->init( $context ); - return Xml::encodeJsCall( 'mw.config.set', array( 'wgMobileDeviceName', $this->xDevice ) ); - } -} - -class MobileDeviceDetectStylesModule extends MobileDeviceDetectModule { public function getStyles( ResourceLoaderContext $context ) { $this->init( $context ); -- To view, visit https://gerrit.wikimedia.org/r/61989 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If219c84d4755697ab849cfc083fa9234382f30f6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Jdlrobson <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
