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

Hide article list on prefix blur or on Esc

Browse Source
This commit is contained in:
Jaifroid 2019-05-19 12:38:12 +01:00
parent 7442e665be
commit 4c79abec55
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
www/js/app.js
View File

@ -71,7 +71,6 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies','abstractFiles
function resizeIFrame() { function resizeIFrame() {
var height = $(window).outerHeight() var height = $(window).outerHeight()
- $("#top").outerHeight(true) - $("#top").outerHeight(true)
- $("#articleListWithHeader").outerHeight(true)
// TODO : this 5 should be dynamically computed, and not hard-coded // TODO : this 5 should be dynamically computed, and not hard-coded
- 5; - 5;
$(".articleIFrame").css("height", height + "px"); $(".articleIFrame").css("height", height + "px");
@ -96,9 +95,22 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies','abstractFiles
}); });
$('#prefix').on('keyup', function(e) { $('#prefix').on('keyup', function(e) {
if (selectedArchive !== null && selectedArchive.isReady()) { if (selectedArchive !== null && selectedArchive.isReady()) {
if (/^Esc/.test(e.key)) {
// Hide the article list
$('#articleListWithHeader').hide();
$('#articleContent').focus();
return;
}
onKeyUpPrefix(e); onKeyUpPrefix(e);
} }
}); });
$('#prefix').on('focus', function(e) {
if ($('#prefix').val() !== '')
$('#articleListWithHeader').show();
});
$('#prefix').on('blur', function() {
$('#articleListWithHeader').hide();
});
$("#btnRandomArticle").on("click", function(e) { $("#btnRandomArticle").on("click", function(e) {
$('#prefix').val(""); $('#prefix').val("");
goToRandomArticle(); goToRandomArticle();
@ -777,7 +789,12 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies','abstractFiles
'" class="list-group-item">' + dirEntry.getTitleOrUrl() + '</a>'; '" class="list-group-item">' + dirEntry.getTitleOrUrl() + '</a>';
} }
articleListDiv.html(articleListDivHtml); articleListDiv.html(articleListDivHtml);
$('#articleList a').on('click', handleTitleClick); // We have to use mousedown below instead of click as otherwise the prefix blur event fires first
// and prevents this event from firing; note that touch also triggers mousedown
$('#articleList a').on('mousedown', function (e) {
handleTitleClick(e);
return false;
});
$('#searchingArticles').hide(); $('#searchingArticles').hide();
$('#articleListWithHeader').show(); $('#articleListWithHeader').show();
} }