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

Prevent hiding of articleList on clicking searchArticles button #562 (#563)

Browse Source 
Fixes #562. Possibly also #536.
This commit is contained in:
Jaifroid 2019-08-29 17:50:06 +01:00 committed by GitHub
parent 1cd958752c
commit b954b323b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
www/js/app.js
View File

@ -79,7 +79,8 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies','abstractFiles
$(window).resize(resizeIFrame);
// Define behavior of HTML elements
$('#searchArticles').on('click', function(e) {
var searchArticlesFocused = false;
$('#searchArticles').on('click', function() {
$("#welcomeText").hide();
$('.alert').hide();
$("#searchingArticles").show();
@ -88,9 +89,16 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies','abstractFiles
if ($('#navbarToggle').is(":visible") && $('#liHomeNav').is(':visible')) {
$('#navbarToggle').click();
}
document.getElementById('prefix').focus();
// This flag is set to true in the mousedown event below
searchArticlesFocused = false;
});
$('#formArticleSearch').on('submit', function(e) {
document.getElementById("searchArticles").click();
$('#searchArticles').on('mousedown', function() {
// We set the flag so that the blur event of #prefix can know that the searchArticles button has been clicked
searchArticlesFocused = true;
});
$('#formArticleSearch').on('submit', function() {
document.getElementById('searchArticles').click();
return false;
});
// Handle keyboard events in the prefix (article search) field
@ -160,9 +168,9 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies','abstractFiles
if ($('#prefix').val() !== '')
$('#articleListWithHeader').show();
});
// Hide the search resutls if user moves out of prefix field
// Hide the search results if user moves out of prefix field
$('#prefix').on('blur', function() {
$('#articleListWithHeader').hide();
if (!searchArticlesFocused) $('#articleListWithHeader').hide();
});
$("#btnRandomArticle").on("click", function(e) {
$('#prefix').val("");