kiwix/kiwix-js-pwa
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-js-pwa.git synced 2025-08-03 03:18:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix actionparse wikimedia custom styling (#717)

Browse Source
This commit is contained in:
Jaifroid 2025-05-25 21:51:40 +01:00 committed by GitHub
parent 0b535dce17
commit 0c4ac909a3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 4584 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
KiwixWebApp-github.jsproj
View File

@ -152,6 +152,7 @@
<Content Include="www\-\mw\mw.TMHGalleryHook.js.css" />
<Content Include="www\-\mw\newstyle_main_page.css" />
<Content Include="www\-\mw\style.css" />
<Content Include="www\-\mw\skins.vector.styles.css" />
<Content Include="www\-\style.css" />
<Content Include="www\-\s\css_modules\mediawiki.action.view.redirectPage.css" />
<Content Include="www\-\s\css_modules\minerva.css" />

1
KiwixWebApp.jsproj
View File

@ -153,6 +153,7 @@
<Content Include="www\-\mw\mw.TMHGalleryHook.js.css" />
<Content Include="www\-\mw\newstyle_main_page.css" />
<Content Include="www\-\mw\style.css" />
<Content Include="www\-\mw\skins.vector.styles.css" />
<Content Include="www\-\style.css" />
<Content Include="www\-\s\css_modules\mediawiki.action.view.redirectPage.css" />
<Content Include="www\-\s\css_modules\minerva.css" />

1
service-worker.js
View File

@ -143,6 +143,7 @@ const precacheFiles = [
'www/-/mw/mw.PopUpMediaTransform.css',
'www/-/mw/mw.TMHGalleryHook.js.css',
'www/-/mw/newstyle_main_page.css',
'www/-/mw/skins.vector.styles.css',
'www/-/mw/style.css',
'www/-/s/css_modules/content.parsoid.css',
'www/-/s/css_modules/ext.cite.a11y.css',

4565
www/-/mw/skins.vector.styles.css Normal file
View File

File diff suppressed because it is too large Load Diff

18
www/js/app.js
View File

@ -2684,6 +2684,16 @@ function removePageMaxWidth () {
}
docStyle.margin = '0 auto';
}
// Remove class key "mw-page-container-inner" from any element with that class (for actionparse ZIMs)
var actionParseRemoveClasses = ['mw-page-container-inner', ''];
for (i = 0; i < actionParseRemoveClasses.length; i++) {
var mwPageContainer = doc.getElementsByClassName(actionParseRemoveClasses[i]);
if (mwPageContainer && mwPageContainer.length) {
for (var j = 0; j < mwPageContainer.length; j++) {
mwPageContainer[j].classList.remove(actionParseRemoveClasses[i]);
}
}
}
if (doc.body && doc.body.classList.contains('article-list-home')) {
doc.body.style.padding = '2em';
}
@ -6243,8 +6253,8 @@ function displayArticleContentInContainer (dirEntry, htmlArticle) {
// Put site.js in the correct position
htmlArticle = htmlArticle.replace(/(<script\b[^>]+\/site\.js["']><\/script>\s*)((?:[^<]|<(?!\/body))+)/, '$2$1');
// @TODO Remove when fixed in https://github.com/openzim/mwoffliner/issues/1872
// Add missing title to WikiMedia articles for post June 2023 scrapes
htmlArticle = !params.isLandingPage && !/<h1\b[^>]+(?:section-heading|section-title|article-header)/i.test(htmlArticle) ? htmlArticle.replace(/(<section\sdata-mw-section-id="0"[^>]+>\s*)/i, '$1<h1 style="margin:10px 0">' + dirEntry.getTitleOrUrl().replace(/&lt;/g, '<') + '</h1>') : htmlArticle;
// Add missing title to WikiMedia articles for post June 2023 scrapes, also post-June 2025
htmlArticle = !params.isLandingPage && !/<h1\b[^>]+(?:section-heading|section-title|article-header|first-heading)/i.test(htmlArticle) ? htmlArticle.replace(/(<section\sdata-mw-section-id="0"[^>]+>\s*)/i, '$1<h1 style="margin:10px 0">' + dirEntry.getTitleOrUrl().replace(/&lt;/g, '<') + '</h1>') : htmlArticle;
// Remove hard-coded image widths for new mobile-html endpoint ZIMs
htmlArticle = htmlArticle.replace(/(<div\s+class=['"]thumb\stright['"][^<]+?<div\s+class=['"]thumbinner['"]\s+style=['"])width:\s*642px([^<]+?<img\s[^>]+?width=)[^>]+?height=['"][^'"]+?['"]/ig, '$1$2"320px"');
htmlArticle = htmlArticle.replace(/(<img\s[^>]+(?:min-width:\s*|width=['"]))(\d+px)([^>]+>\s*<div\b[^>]+style=['"])/ig, '$1$2$3max-width: $2; ');
@ -6254,7 +6264,7 @@ function displayArticleContentInContainer (dirEntry, htmlArticle) {
// Convert section tags to details tags (we have to loop because regex only matches innermost <section>...</section>)
for (i = 5; i--;) {
htmlArticle = htmlArticle.replace(/<section\b([^>]*data-mw-section-id=["'][1-9][^>]*)>((?:(?=([^<]+))\3|<(?!section\b[^>]*>))*?)<\/section>/ig, function (m0, m1, m2) {
var summary = m2.replace(/(?:<div\s+class=["']pcs-edit[^>]+>)?(<(h[2-9])\b[^>]*>(?:[^<]|<(?!\2))+?<\/\2>)(?:<\/div>)?/i, '<summary class="section-heading collapsible-heading">$1</summary>');
var summary = m2.replace(/(?:<div\s+class=["'](?:pcs-edit|mw-heading)[^>]+>)?(<(h[2-9])\b[^>]*>(?:[^<]|<(?!\2))+?<\/\2>)(?:<\/div>)?/i, '<summary class="section-heading collapsible-heading">$1</summary>');
return '<details ' + m1 + '>' + summary + '</details>';
});
// We can stop iterating if all sections are consumed
@ -6491,7 +6501,7 @@ function displayArticleContentInContainer (dirEntry, htmlArticle) {
zimType = /-\/s\/style\.css/i.test(testCSS) ? 'desktop' : zimType;
zimType = /-\/static\/main\.css|statc\/css\/sotoki.css/i.test(testCSS) ? 'desktop-stx' : zimType; // Support stackexchange
zimType = /gutenberg\.css/i.test(testCSS) ? 'desktop-gtb' : zimType; // Support Gutenberg
zimType = /minerva|mobile/i.test(testCSS) ? 'mobile' : zimType;
zimType = /minerva|mobile|vector/i.test(testCSS) ? 'mobile' : zimType;
cssSource = cssSource == 'auto' ? zimType : cssSource; // Default to in-built zimType if user has selected automatic detection of styles
if (/minerva|inserted.style|pcs\.css/i.test(testCSS) && (cssCache || zimType != cssSource)) {
// Substitute ridiculously long style name TODO: move this code to transformStyles

2
www/js/lib/transformStyles.js
View File

@ -103,6 +103,7 @@ function filterCSS (zl, zim, cc, cs, i) {
/\/static\/css\/sotoki.css/i.test(zl) ||
/\/mobile.css/i.test(zl) ||
/\/style-mobile.css/i.test(zl) ||
/\/skins.vector.styles.css/i.test(zl) ||
/\/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)
@ -112,6 +113,7 @@ function filterCSS (zl, zim, cc, cs, i) {
// Rename this required mobile style so that we don't trigger reading ZIM as mobile in print intercept
zl = /\/mobile_main_page\.css/.test(zl) ? '-/mw/newstyle_main_page.css' : zl;
zl = /\/content\.parsoid\.css/.test(zl) ? '-/s/css_modules/content.parsoid.css' : zl;
zl = /skins\.vector\.styles\.css/.test(zl) ? '-/mw/skins.vector.styles.css' : zl;
zl = /\/sotoki\.css/.test(zl) ? 'C/static/css/sotoki.css' : zl;
// Replace bootstrap with own: DEV: when upgrading to Bootstrap 4, stop doing this!
zl = zl.replace(/.+(bootstrap[^/]*?\.css)/i, 'css/$1');