diff --git a/www/js/app.js b/www/js/app.js index f078b557..a5fb4e15 100644 --- a/www/js/app.js +++ b/www/js/app.js @@ -1691,7 +1691,7 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies', 'q', 'module' //TESTING - find out whether document contains MathSVGs //Replace inline Math TeX with dummy images - if (params.useMathJax) htmlArticle = htmlArticle.replace(/\$\$?((?:[^$<>]|<\s|\s>)+)\$\$?([\s<.,;:?!])/g, '$1$2'); + if (params.useMathJax) htmlArticle = htmlArticle.replace(/\$\$?((?:[^$<>]|<\s|\s>)+)\$\$?([\s<.,;:?!'"])/g, '$1$2'); var containsMathSVG = /alt\s*=\s*['"][^'"]+['"][^>]+mwe-math-fallback-image|mwe-math-fallback-image[^>]+alt\s*=\s*['"][^'"]+['"]/i.test(htmlArticle); //Preload stylesheets [kiwix-js @149] @@ -1898,17 +1898,12 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies', 'q', 'module' $('#articleContent').contents().find('head').append(""); //Load MathJax if required and if not already loaded - //if (containsMathSVG || containsMathTeX) { if (containsMathSVG) { if (params.useMathJax && !window.frames[0].MathJax) { var doc = $("#articleContent").contents()[0]; var script = doc.createElement("script"); script.type = "text/javascript"; script.src = "/www/js/MathJax/MathJax.js?config=TeX-AMS_HTML-full"; - //if (containsMathTeX) script.innerHTML = "MathJax.Hub.Config({\n" + - // "tex2jax: { inlineMath: [['$','$'], ['\\\\(','\\\\)']] }\n" + - // "});\n" + - // "MathJax.Hub.Queue(['Typeset', MathJax.Hub]);"; doc.head.appendChild(script); } } diff --git a/www/js/init.js b/www/js/init.js index c1079b33..2bc28db5 100644 --- a/www/js/init.js +++ b/www/js/init.js @@ -70,7 +70,7 @@ var versionDivs = document.getElementsByClassName('fileVersion'); for (var i = 0; i < versionDivs.length; i++) { versionDivs[i].innerHTML = i ? params.fileVersion.replace(/\s+.+$/, "") : params['fileVersion']; } -if (!params.showFileSelectors && params.packagedFile && params.storedFile && (params.storedFile != params.packagedFile)) { +if (!params.showFileSelectors && params.packagedFile && params.storedFile && params.storedFile != params.packagedFile) { var currentArchive = document.getElementById('currentArchive'); if (currentArchive) { currentArchive.innerHTML = "Currently loaded archive: " + params.storedFile.replace(/\.zim$/i, "") + "";