Restore the ability to set $wgResourceModuleSkinStyles for 'oojs-ui-core.styles'
authorBartosz Dziewoński <matma.rex@gmail.com>
Mon, 5 Jun 2017 17:32:23 +0000 (19:32 +0200)
committerBartosz Dziewoński <matma.rex@gmail.com>
Mon, 5 Jun 2017 22:05:17 +0000 (00:05 +0200)
commit51eede02837a3a9d378cb35fa7c27a9f4e8e5f4e
treef702fc31bdd7993c6266f19f38e9cbb3671bcabf
parent10fed98b84760fae26cd3eabb5d23cc495f70c77
Restore the ability to set $wgResourceModuleSkinStyles for 'oojs-ui-core.styles'

In c8ad83310f425433791102e8a958397f2d701b65, 'oojs-ui-core.styles'
was changed to use ResourceLoaderOOUIFileModule instead of plain
ResourceLoaderFileModule. This had the unintended consequence that
ResourceLoader::isFileModule() no longer returned true for it, and
this $wgResourceModuleSkinStyles no longer worked, breaking styling
in Vector.

Additionally, the new ResourceLoaderOOUIFileModule did not respect
the skinScripts/skinStyles options passed in the module definition
(therefore also those from $wgResourceModuleSkinStyles). Merging
them turns out to be a major pain, but it can be done.

Bug: T167042
Change-Id: I7547bbe996467745c1f0b168b40f27eb95c6238d
includes/resourceloader/ResourceLoader.php
includes/resourceloader/ResourceLoaderOOUIFileModule.php