Dirty patch to remove rogue JS that attempts to break out of iframe

#376
kiwix · Mar 3, 2023 · da6b1bc · da6b1bc
1 parent 385b320
commit da6b1bc
Showing 1 changed file with 12 additions and 7 deletions.
diff --git a/www/js/app.js b/www/js/app.js
@@ -4572,17 +4572,22 @@ define(['jquery', 'zimArchiveLoader', 'uiUtil', 'util', 'utf8', 'cache', 'images
             }
 
             if (params.zimType === 'open') {
-                //Some documents (e.g. Ray Charles Index) can't be scrolled to the very end, as some content remains benath the footer
-                //so add some whitespace at the end of the document
+                // Some documents (e.g. Ray Charles Index) can't be scrolled to the very end, as some content remains benath the footer
+                // so add some whitespace at the end of the document
                 htmlArticle = htmlArticle.replace(/(<\/body>)/i, "\r\n<p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p>\r\n$1");
                 htmlArticle = htmlArticle.replace(/(dditional\s+terms\s+may\s+apply\s+for\s+the\s+media\s+files[^<]+<\/div>\s*)/i, "$1\r\n<h1></h1><p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p>\r\n");
 
-                //@TODO - remove this when issue fixed: VERY DIRTY PATCH FOR HTML IN PAGE TITLES on Wikivoyage
-                htmlArticle = htmlArticle.replace(/&lt;a href[^"]+"\/wiki\/([^"]+)[^<]+&gt;([^<]+)&lt;\/a&gt;/ig, "<a href=\"$1.html\">$2</a>");
-                htmlArticle = htmlArticle.replace(/&lt;(\/?)(i|b|em|strong)&gt;/ig, "<$1$2>");
+                // Reduce weight of unused JS archives for mediawiki ZIMs. This patch also removes mediawiki.page.ready.js which breakds the iframe kiwix-js #972
+                if (appstate.wikimediaZimLoaded) {
+                    htmlArticle = htmlArticle.replace(/<script\b[^<]+src=["'][^"']*(mediawiki|jquery|configvars|startup|visibilitytoggles|site|enhancements|scribunto|ext\.math|\.player)[^"']*\.js\b[^<]+<\/script>/gi, '');
 
-                //@TODO - remove when fixed on mw-offliner: dirty patch for removing extraneous tags in ids
-                htmlArticle = htmlArticle.replace(/(\bid\s*=\s*"[^\s}]+)\s*\}[^"]*/g, "$1");
+                    //@TODO - remove this when issue fixed: VERY DIRTY PATCH FOR HTML IN PAGE TITLES on Wikivoyage
+                    htmlArticle = htmlArticle.replace(/&lt;a href[^"]+"\/wiki\/([^"]+)[^<]+&gt;([^<]+)&lt;\/a&gt;/ig, "<a href=\"$1.html\">$2</a>");
+                    htmlArticle = htmlArticle.replace(/&lt;(\/?)(i|b|em|strong)&gt;/ig, "<$1$2>");
+
+                    //@TODO - remove when fixed on mw-offliner: dirty patch for removing extraneous tags in ids
+                    htmlArticle = htmlArticle.replace(/(\bid\s*=\s*"[^\s}]+)\s*\}[^"]*/g, "$1");
+                }
 
                 //@TODO - remove when fixed in MDwiki ZIM: dirty patch for removing erroneously hard-coded style
                 if (/^mdwiki/.test(appstate.selectedArchive._file.name)) htmlArticle = htmlArticle.replace(/(class=['"]thumbinner[^>]+style=['"]width\s*:\s*)\d+px/ig, "$1320px");