kiwix/kiwix-js-pwa
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-js-pwa.git synced 2025-09-10 04:40:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

First build for prerelease

Browse Source 
# Conflicts:
#	package.json


Former-commit-id: 419ac7b0f1dce91e5a12ac166b36f94bea6cb317 [formerly ff74169f4f5c64764147123d72755a843cf232d8]
Former-commit-id: a169f163ae2e3f5c592447bc21781321104c3e7c
This commit is contained in:
Jaifroid 2019-08-09 17:53:43 +01:00
parent e66a9e44de
commit a97a90d851
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
www/js/app.js
View File

@ -578,7 +578,6 @@ define(['jquery', 'zimArchiveLoader', 'uiUtil', 'util', 'utf8', 'images', 'cooki
// Top menu : // Top menu :
document.getElementById('btnHome').addEventListener('click', function () { document.getElementById('btnHome').addEventListener('click', function () {
setTab('btnHome'); setTab('btnHome');
//$('#articleContent').hide();
$('#articleContent').contents().empty(); $('#articleContent').contents().empty();
$('#searchingArticles').hide(); $('#searchingArticles').hide();
$('#welcomeText').show(); $('#welcomeText').show();
@ -649,7 +648,9 @@ define(['jquery', 'zimArchiveLoader', 'uiUtil', 'util', 'utf8', 'images', 'cooki
$('#about').hide(); $('#about').hide();
$('#configuration').hide(); $('#configuration').hide();
$('#formArticleSearch').show(); $('#formArticleSearch').show();
if (!activeBtn || activeBtn == 'btnHome') $('#articleContent').show(); if (!activeBtn || activeBtn == 'btnHome') {
document.getElementById('articleContent').style.display = 'block';
}
$("#articleList").empty(); $("#articleList").empty();
$('#articleListHeaderMessage').empty(); $('#articleListHeaderMessage').empty();
$('#articleListWithHeader').hide(); $('#articleListWithHeader').hide();
@ -2834,6 +2835,9 @@ define(['jquery', 'zimArchiveLoader', 'uiUtil', 'util', 'utf8', 'images', 'cooki
$('#downloadAlert').hide(); $('#downloadAlert').hide();
var iframeArticleContent = document.getElementById('articleContent'); var iframeArticleContent = document.getElementById('articleContent');
// Hide the iframe while loading
iframeArticleContent.style.display = 'none';
if (params.contentInjectionMode === 'serviceworker') { if (params.contentInjectionMode === 'serviceworker') {
params.transformedHTML = htmlArticle; params.transformedHTML = htmlArticle;
@ -3079,9 +3083,6 @@ define(['jquery', 'zimArchiveLoader', 'uiUtil', 'util', 'utf8', 'images', 'cooki
articleContent.write(htmlArticle); articleContent.write(htmlArticle);
articleContent.close(); articleContent.close();
// Hide the iframe while loading
iframeArticleContent.style.display = 'none';
} // End of injectHtml } // End of injectHtml
function insertMediaBlobsJQuery() { function insertMediaBlobsJQuery() {