diff options
| -rw-r--r-- | includes/ResourceLoader/FileModule.php | 18 | ||||
| -rw-r--r-- | tests/phpunit/includes/ResourceLoader/FileModuleTest.php | 10 |
2 files changed, 0 insertions, 28 deletions
diff --git a/includes/ResourceLoader/FileModule.php b/includes/ResourceLoader/FileModule.php index 4c7147a87eaf..53902c1d26bb 100644 --- a/includes/ResourceLoader/FileModule.php +++ b/includes/ResourceLoader/FileModule.php @@ -244,24 +244,6 @@ class FileModule extends Module { break; } } - // In future this should be expanded to cover modules using packageFiles as well. - $isModernCode = $this->requiresES6(); - if ( $isModernCode ) { - // If targets omitted, modern code should automatically default to mobile+desktop targets. - $isNotMobileTargeted = !in_array( 'mobile', $this->targets ); - // Modern JavaScript should never be restricted to desktop-only (see T323542) - if ( $isNotMobileTargeted ) { - // Add the mobile target to these modules. - $this->targets[] = 'mobile'; - $targetsSpecified = isset( $options['targets'] ); - // If the user intentionally tried to avoid adding to mobile log a warning. - if ( $targetsSpecified ) { - $this->getLogger()->warning( "When 'es6' is enabled, module will automatically target mobile.", [ - 'module' => $this->getName(), - ] ); - } - } - } if ( isset( $options['scripts'] ) && isset( $options['packageFiles'] ) ) { throw new InvalidArgumentException( "A module may not set both 'scripts' and 'packageFiles'" ); } diff --git a/tests/phpunit/includes/ResourceLoader/FileModuleTest.php b/tests/phpunit/includes/ResourceLoader/FileModuleTest.php index 9046ea6f9b3a..78877a3b711e 100644 --- a/tests/phpunit/includes/ResourceLoader/FileModuleTest.php +++ b/tests/phpunit/includes/ResourceLoader/FileModuleTest.php @@ -958,15 +958,5 @@ class FileModuleTest extends ResourceLoaderTestCase { $this->assertFalse( $module->requiresES6(), 'requiresES6 is false when set to false' ); $module = new FileModule( [ 'es6' => true ] ); $this->assertTrue( $module->requiresES6(), 'requiresES6 is true when set to true' ); - $module = new FileModule( [ 'es6' => true, 'targets' => 'desktop' ] ); - $this->assertEquals( $module->getTargets(), [ 'desktop', 'mobile' ], 'Targets ignored if es6 is set.' ); - $module = new FileModule( [ 'es6' => true, 'targets' => [ 'desktop' ] ] ); - $this->assertEquals( $module->getTargets(), [ 'desktop', 'mobile' ], 'Targets ignored if es6 is set.' ); - - // Check if it's still possible to define modules targetting mobile. - $module = new FileModule( [ 'es6' => true, 'targets' => 'mobile' ] ); - $this->assertTrue( $module->requiresES6(), 'requiresES6 is true when set to true' ); - $module = new FileModule( [ 'es6' => true, 'targets' => [ 'mobile' ] ] ); - $this->assertTrue( $module->requiresES6(), 'requiresES6 is true when set to true' ); } } |