Bartosz Dziewoński has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371221 )

Change subject: Split off styles from skins.apex
......................................................................

Split off styles from skins.apex

MediaWiki now refuses to accept addModuleStyles() calls for modules
that include scripts.

Change-Id: I59ce313fc637445db4dd99c87b4b61a1a3dd2301
---
M SkinApex.php
M skin.json
2 files changed, 7 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/apex 
refs/changes/21/371221/1

diff --git a/SkinApex.php b/SkinApex.php
index 6f5f23e..05b6e0d 100644
--- a/SkinApex.php
+++ b/SkinApex.php
@@ -34,7 +34,7 @@
                                '.gradient { filter: none; 
}</style><![endif]-->'
                );
 
-               $out->addModuleScripts( 'skins.apex' );
+               $out->addModules( 'skins.apex' );
        }
 
        /**
@@ -46,7 +46,7 @@
                parent::setupSkinUserCss( $out );
                $out->addModuleStyles( [
                        'mediawiki.skinning.interface',
-                       'skins.apex'
+                       'skins.apex.styles'
                ] );
        }
 
diff --git a/skin.json b/skin.json
index 4bc6316..e644919 100644
--- a/skin.json
+++ b/skin.json
@@ -26,6 +26,10 @@
        "ResourceModules": {
                "skins.apex": {
                        "position": "bottom",
+                       "scripts": "resources/apex.js"
+               },
+               "skins.apex.styles": {
+                       "position": "bottom",
                        "styles": {
                                "resources/screen.css": {
                                        "media": "screen"
@@ -36,8 +40,7 @@
                                "resources/screen-wide.css": {
                                        "media": "screen and (min-width: 982px)"
                                }
-                       },
-                       "scripts": "resources/apex.js"
+                       }
                }
        },
        "ResourceFileModulePaths": {

-- 
To view, visit https://gerrit.wikimedia.org/r/371221
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I59ce313fc637445db4dd99c87b4b61a1a3dd2301
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/apex
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <matma....@gmail.com>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to