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

Display index in modal

Browse Source 
Former-commit-id: 17b4f3696e3d98820d358661e20a48dfc8128ae8 [formerly 865022f7a8b2723d4b802569253b765a56c57e68]
Former-commit-id: 272199c49439ec3eb32c2a8873c3b14a5757afee
This commit is contained in:
Jaifroid 2018-11-26 21:43:08 +00:00
parent cb4288642e
commit 7b073daeb6
2 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
www/index.html
View File

@ -42,8 +42,8 @@
<!-- Modal info --> <!-- Modal info -->
<div id="myModal" class="modal"> <div id="myModal" class="modal">
<div class="modal-dialog modal-full"> <div class="modal-dialog modal-full">
<div class="modal-content dark"> <div id="modalTheme" class="modal-content dark">
<div class="modal-body"> <div id="largeModal" class="modal-body">
<button class="close" aria-hidden="true" type="button" data-dismiss="modal">&times;</button> <button class="close" aria-hidden="true" type="button" data-dismiss="modal">&times;</button>
<img style="float:left; padding-right:1em;" alt="Kiwix icon" src="img/icons/kiwix-midnightblue-90.png"> <img style="float:left; padding-right:1em;" alt="Kiwix icon" src="img/icons/kiwix-midnightblue-90.png">

30
www/js/app.js
View File

@ -1655,12 +1655,15 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies', 'q', 'module'
} }
if (selectedArchive !== null && selectedArchive.isReady()) { if (selectedArchive !== null && selectedArchive.isReady()) {
selectedArchive.findDirEntriesWithPrefixCaseSensitive(prefix, MAX_SEARCH_RESULT_SIZE, function(dirEntryArray, nextStart) { selectedArchive.findDirEntriesWithPrefixCaseSensitive(prefix, MAX_SEARCH_RESULT_SIZE, function(dirEntryArray, nextStart) {
var docBody = document.getElementById('articleContent').contentDocument.body; //var docBody = document.getElementById('articleContent').contentDocument.body;
var docBody = document.getElementById('largeModal');
var newHtml = ""; var newHtml = "";
for (var i = 0; i < dirEntryArray.length; i++) { for (var i = 0; i < dirEntryArray.length; i++) {
var dirEntry = dirEntryArray[i]; var dirEntry = dirEntryArray[i];
newHtml += "\n<li><a class='list-group-item' href='#' dirEntryId='" + dirEntry.toStringId().replace(/'/g,"&apos;") //newHtml += "\n<li><a class='list-group-item' href='#' dirEntryId='" + dirEntry.toStringId().replace(/'/g,"&apos;")
+ "'>" + (dirEntry.title ? dirEntry.title : '[' + dirEntry.url + ']') + "</a></li>"; // + "'>" + (dirEntry.title ? dirEntry.title : '[' + dirEntry.url + ']') + "</a></li>";
newHtml += "\n<a class='list-group-item' href='#' dirEntryId='" + dirEntry.toStringId().replace(/'/g, "&apos;")
+ "'>" + (dirEntry.title ? dirEntry.title : '[' + dirEntry.url + ']') + "</a>";
} }
start = start ? start : 0; start = start ? start : 0;
var back = start ? '<a href="#" data-start="' + (start - MAX_SEARCH_RESULT_SIZE) + var back = start ? '<a href="#" data-start="' + (start - MAX_SEARCH_RESULT_SIZE) +
@ -1678,14 +1681,21 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies', 'q', 'module'
alphaSelector.push('<a href="#" class="alphaSelector" data-sel="¡">¡¿À</a>'); alphaSelector.push('<a href="#" class="alphaSelector" data-sel="¡">¡¿À</a>');
alphaSelector.unshift('<a href="#" class="alphaSelector" data-sel="!">!#123</a>'); alphaSelector.unshift('<a href="#" class="alphaSelector" data-sel="!">!#123</a>');
var alphaString = '<div style="text-align:center">[ ' + alphaSelector.join(' | \n') + ' ]</div>\n'; var alphaString = '<div style="text-align:center">[ ' + alphaSelector.join(' | \n') + ' ]</div>\n';
docBody.innerHTML = '<div style="margin:0 5em;line-height:150%;">\n' + alphaString + var closeButton = '<button class="close" aria-hidden="true" type="button" data-dismiss="modal">&times;</button>';
//docBody.innerHTML = closeButton + '<div style="margin:0 5em;line-height:150%;">\n' + alphaString +
docBody.innerHTML = closeButton + '<div>\n' + alphaString +
'<div style="float:right;">' + backNext + '</div>\n' + '<div style="float:right;">' + backNext + '</div>\n' +
'<h2 style="padding:0 0 1em;">ZIM Archive Index</h2>\n' + //'<h2 style="padding:0 0 1em;">ZIM Archive Index</h2>\n' +
'<ul id="zimIndex" class="list-group">' + newHtml + '\n</ul><br />\n' + '<h2>ZIM Archive Index</h2>\n' +
//'<ul id="zimIndex" class="list-group">' + newHtml + '\n</ul><br />\n' +
'<div id="zimIndex" class="list-group">' + newHtml + '\n</div><br />\n' +
'<div><p style="text-align:right;">' + backNext + '\n</p></div>\n' + '<div><p style="text-align:right;">' + backNext + '\n</p></div>\n' +
alphaString + '<br /><br /><br /></div>\n'; alphaString + '<br /><br /><br /></div>\n';
var indexEntries = docBody.querySelectorAll('.list-group-item'); var indexEntries = docBody.querySelectorAll('.list-group-item');
$(indexEntries).on("click", handleTitleClick); $(indexEntries).on("click", function (event) {
$("#myModal").modal('hide');
handleTitleClick(event);
});
var continueAnchors = docBody.querySelectorAll('.continueAnchor'); var continueAnchors = docBody.querySelectorAll('.continueAnchor');
$(continueAnchors).on('click', function(e) { $(continueAnchors).on('click', function(e) {
document.getElementById('prefix').value = ''; document.getElementById('prefix').value = '';
@ -1702,6 +1712,12 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies', 'q', 'module'
}); });
$('#searchingArticles').hide(); $('#searchingArticles').hide();
$('#articleListWithHeader').hide(); $('#articleListWithHeader').hide();
var modalTheme = document.getElementById('modalTheme');
modalTheme.classList.remove('dark');
if (params.cssUITheme === 'dark') modalTheme.classList.add('dark');
$('#myModal').modal({
backdrop: "static"
});
}, start); }, start);
} }
} }