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

Reformat some code and rename setHomeTab to setTab

Browse Source 
Former-commit-id: aeae3a8f86aa688003fed185f45942ac41b58817 [formerly bb2163685ae7d182d568754b5cb27720d28213ef]
Former-commit-id: ac9797d873865a5b6a9fc78687c4342a5c0ad207
This commit is contained in:
Jaifroid 2018-03-04 12:47:13 +00:00
parent c2236554c6
commit f8ac6b3bb9
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
www/js/app.js
View File

@ -152,11 +152,11 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies', 'q', 'module'
function clearFindInArticle() { function clearFindInArticle() {
document.getElementById('findInArticle').value = ""; if (document.getElementById('row2').style.display == "none") return;
if (typeof localSearch != "undefined" && localSearch.remove) { if (typeof localSearch != "undefined" && localSearch.remove) {
localSearch.remove(); localSearch.remove();
//if (localSearch.node) delete localSearch.node;
} }
document.getElementById('findInArticle').value = "";
document.getElementById('matches').innerHTML = "Full: 0"; document.getElementById('matches').innerHTML = "Full: 0";
document.getElementById('partial').innerHTML = "Partial: 0"; document.getElementById('partial').innerHTML = "Partial: 0";
document.getElementById('row2').style.display = "none"; document.getElementById('row2').style.display = "none";
@ -164,17 +164,17 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies', 'q', 'module'
} }
$('#findText').on('click', function (e) { $('#findText').on('click', function (e) {
var findInArticle = null;
var innerDocument = window.frames[0].frameElement.contentDocument;
innerDocument = innerDocument ? innerDocument.body : null;
if (!innerDocument || innerDocument.innerHTML.length < 10) return;
var searchDiv = document.getElementById('row2'); var searchDiv = document.getElementById('row2');
findInArticle = document.getElementById('findInArticle');
if (searchDiv.style.display != "none") { if (searchDiv.style.display != "none") {
clearFindInArticle(); clearFindInArticle();
return; return;
} }
setHomeTab('findText'); var findInArticle = null;
var innerDocument = window.frames[0].frameElement.contentDocument;
innerDocument = innerDocument ? innerDocument.body : null;
if (!innerDocument || innerDocument.innerHTML.length < 10) return;
setTab('findText');
findInArticle = document.getElementById('findInArticle');
searchDiv.style.display = "block"; searchDiv.style.display = "block";
findInArticle.focus(); findInArticle.focus();
localSearch = new util.Hilitor(innerDocument); localSearch = new util.Hilitor(innerDocument);
@ -185,15 +185,15 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies', 'q', 'module'
//Ensure timeout doesn't occur if another key has been pressed within time window //Ensure timeout doesn't occur if another key has been pressed within time window
clearTimeout(timer); clearTimeout(timer);
//If user pressed Alt-F or Ctrl-F, exit //If user pressed Alt-F or Ctrl-F, exit
if ((e.altKey || e.ctrlKey) && e.which == 70) return; if ((e.altKey || e.ctrlKey) && e.which == 70) return false;
var val = this.value; var val = this.value;
//If user pressed enter / return key //If user pressed enter / return key
if (val && e.which == 13) { if (val && e.which == 13) {
localSearch.scrollFrom = localSearch.scrollToFullMatch(val, localSearch.scrollFrom); localSearch.scrollFrom = localSearch.scrollToFullMatch(val, localSearch.scrollFrom);
return; return false;
} }
//If value hasn't changed, exit //If value hasn't changed, exit
if (val == localSearch.lastScrollValue) return; if (val == localSearch.lastScrollValue) return false;
//Ensure nothing happens if only one value has been entered (not specific enough), but ensure timeout is set //Ensure nothing happens if only one value has been entered (not specific enough), but ensure timeout is set
//if no value has been entered (clears highlighting if user deletes all values in search field) //if no value has been entered (clears highlighting if user deletes all values in search field)
if (~(val.length - 2)) { if (~(val.length - 2)) {
@ -222,7 +222,7 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies', 'q', 'module'
}); });
$("#btnRandomArticle").on("click", function (e) { $("#btnRandomArticle").on("click", function (e) {
setHomeTab('btnRandomArticle'); setTab('btnRandomArticle');
//Re-enable top-level scrolling //Re-enable top-level scrolling
document.getElementById('top').style.position = "relative"; document.getElementById('top').style.position = "relative";
document.getElementById('scrollbox').style.position = "fixed"; document.getElementById('scrollbox').style.position = "fixed";
@ -343,7 +343,7 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies', 'q', 'module'
}); });
// Top menu : // Top menu :
$('#btnHome').on('click', function (e) { $('#btnHome').on('click', function (e) {
setHomeTab('btnHome'); setTab('btnHome');
// Give the focus to the search field, and clean up the page contents // Give the focus to the search field, and clean up the page contents
if (!firstRun) { if (!firstRun) {
$('#prefix').focus(); $('#prefix').focus();
@ -361,7 +361,7 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies', 'q', 'module'
return false; return false;
}); });
function setHomeTab(activeBtn) { function setTab(activeBtn) {
// Highlight the selected section in the navbar // Highlight the selected section in the navbar
$('#liHomeNav').attr("class", "active"); $('#liHomeNav').attr("class", "active");
$('#liConfigureNav').attr("class", ""); $('#liConfigureNav').attr("class", "");
@ -423,7 +423,7 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies', 'q', 'module'
$('#btnConfigure').on('click', function (e) { $('#btnConfigure').on('click', function (e) {
var searchDiv = document.getElementById('configuration'); var searchDiv = document.getElementById('configuration');
if (searchDiv.style.display != 'none') { if (searchDiv.style.display != 'none') {
setHomeTab(); setTab();
if (params.themeChanged) { if (params.themeChanged) {
params.themeChanged = false; params.themeChanged = false;
if (history.state !== null) { if (history.state !== null) {
@ -433,7 +433,7 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies', 'q', 'module'
} }
return; return;
} }
setHomeTab('btnConfigure'); setTab('btnConfigure');
// Highlight the selected section in the navbar // Highlight the selected section in the navbar
$('#liHomeNav').attr("class", ""); $('#liHomeNav').attr("class", "");
$('#liConfigureNav').attr("class", "active"); $('#liConfigureNav').attr("class", "active");
@ -479,7 +479,7 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies', 'q', 'module'
//Check if we're 'unclicking' the button //Check if we're 'unclicking' the button
var searchDiv = document.getElementById('about'); var searchDiv = document.getElementById('about');
if (searchDiv.style.display != 'none') { if (searchDiv.style.display != 'none') {
setHomeTab(); setTab();
return; return;
} }
// Highlight the selected section in the navbar // Highlight the selected section in the navbar
@ -489,7 +489,7 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies', 'q', 'module'
if ($('#navbarToggle').is(":visible") && $('#liHomeNav').is(':visible')) { if ($('#navbarToggle').is(":visible") && $('#liHomeNav').is(':visible')) {
$('#navbarToggle').click(); $('#navbarToggle').click();
} }
setHomeTab('btnAbout'); setTab('btnAbout');
//Hide footer toolbar //Hide footer toolbar
document.getElementById('footer').style.display = "none"; document.getElementById('footer').style.display = "none";
// Show the selected content in the page // Show the selected content in the page
@ -1922,7 +1922,7 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies', 'q', 'module'
//Inject htmlArticle into iframe //Inject htmlArticle into iframe
uiUtil.clear(); //Void progress messages uiUtil.clear(); //Void progress messages
setHomeTab(); setTab();
//Inject base tag into html //Inject base tag into html
htmlArticle = htmlArticle.replace(/(<head[^>]*>\s*)/i, '$1<base href="' + baseUrl + '" />\r\n'); htmlArticle = htmlArticle.replace(/(<head[^>]*>\s*)/i, '$1<base href="' + baseUrl + '" />\r\n');
//Display article in iframe //Display article in iframe