From cc3eb53f0f317f1aea015bd2db240990f97cc0ab Mon Sep 17 00:00:00 2001
From: Jaifroid <egk10@cam.ac.uk>
Date: Sun, 24 Jan 2021 23:02:57 +0000
Subject: [PATCH] Fix display of Gutenberg ZIMs

Former-commit-id: 44b5bf9332ebc1e7e0e0f0523d5308ca6dcb8273 [formerly 9ef34c5878fe5267d4cbf5a498730c99fa46024c] [formerly 8b778812935f17c5a5b42c4f66212e8a414ed504] [formerly 33b5bb0c2cddf7366060d05471efeb5192cb20c7 [formerly 156c5a21eb14143007b6c3ae3920c8612f913f5c [formerly 296364b47f5e13f3f3fec500842455ab4c4ddec7]]]
Former-commit-id: b7dd90e1900ff32079219c9a509b2cfac22405e1 [formerly 81597808183baf0f20c359c17302d252588715ae [formerly 5f4499cd94c59a20d21573de78bf71c935c6016a]]
Former-commit-id: d0b492508cd49e7d4f955f3b7b8ae92b68376c1c [formerly 4d1f49e8da0f758c9e874cf644f55496c9ca1eae]
Former-commit-id: ca0e95f10c78f0b284dc10040f1617f688c93cbc
---
 www/js/lib/transformStyles.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/www/js/lib/transformStyles.js b/www/js/lib/transformStyles.js
index 7c27c547..308fa558 100644
--- a/www/js/lib/transformStyles.js
+++ b/www/js/lib/transformStyles.js
@@ -48,7 +48,7 @@ define(['util', 'uiUtil'], function (util, uiUtil) {
             //DEV: Although "." matches any character in regex, there is enough specificity in the patterns below
             //DEV: Add any local stylesheets you wish to include here
             if (cc &&
-                (/-\/(s\/)?style.css/i.test(zl) ||
+                (/-\/(s\/|mw\/)?style.css/i.test(zl) ||
                     /\/mediawiki.toc.css/i.test(zl) ||
                     /\/ext.cite.styles.css/i.test(zl) ||
                     /\/ext.timeline.styles.css/i.test(zl) ||
@@ -72,7 +72,6 @@ define(['util', 'uiUtil'], function (util, uiUtil) {
                     /\/content.parsoid.css/i.test(zl) ||
                     /\/inserted_style_mobile.css/i.test(zl) ||
                     /\/inserted_style.css/i.test(zl) ||
-                    /\/style.css/i.test(zl) ||
                     /-\/static\/bootstrap\/css\/bootstrap.min.css/i.test(zl) ||
                     /-\/static\/bootstrap\/css\/bootstrap-theme.min.css/i.test(zl) ||
                     /-\/static\/main.css/i.test(zl) ||
@@ -81,7 +80,7 @@ define(['util', 'uiUtil'], function (util, uiUtil) {
                     /\/skins.minerva.base.reset\|skins.minerva.content.styles\|ext.cite.style\|mediawiki.page.gallery.styles\|mobile.app.pagestyles.android\|mediawiki.skinning.content.parsoid.css/i.test(zl)
                 )) {
                 zl = zl.replace(/\|/ig, "_"); //Replace "|" with "_" (legacy for some stylesheets with pipes in filename - but next line renders this redundant in current implementation)
-                if (/(-\/(s\/)?style\.css)|minerva|inserted_style_mobile/i.test(zl)) { //If it matches one of the required styles...
+                if (/(-\/(s\/|mw\/)?style\.css)|minerva|inserted_style_mobile/i.test(zl)) { //If it matches one of the required styles...
                     zl = cs == "mobile" ? "-/s/style-mobile.css" : "-/s/style.css";
                 }
                 // Rename this required mobile style so that we don't trigger reading ZIM as mobile in print intercept