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

Optimize selectors

Browse Source 
Former-commit-id: c69f7d46f0fb4d982ddca56a01a5525e8769e124 [formerly 4c3764fd5c1d34dec21f4ea92454c8f5434bbd07 [formerly d0f7b7222c6d095b7a54c7c85dd36294c8d71613]]
Former-commit-id: 920ce199d387f1f0c74a6382e50c3a692782283c
Former-commit-id: d236c52bd45068fb30eec8a9b225f858006877f9
This commit is contained in:
Jaifroid 2021-07-28 17:06:36 +01:00
parent 20ef74cadd
commit f7cf820ff9
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
www/js/lib/kiwixServe.js
View File

@ -612,12 +612,13 @@ define([], function () {
if (subjID && langEntries[i].dataset.kiwixsubject !== subjID && subjID !== "All") langEntries[i].style.display = "none"; if (subjID && langEntries[i].dataset.kiwixsubject !== subjID && subjID !== "All") langEntries[i].style.display = "none";
if (dateID && langEntries[i].dataset.kiwixdate !== dateID && dateID !== "All") langEntries[i].style.display = "none"; if (dateID && langEntries[i].dataset.kiwixdate !== dateID && dateID !== "All") langEntries[i].style.display = "none";
} }
var visibleZIMs = langPanel.innerText.match(/^.*?\.zi[mp]/mgi);
// Prune date list // Prune date list
if (dateID === 'All') { if (dateID === 'All') {
var dateList = dateArray.join('\r\n'); var dateList = dateArray.join('\r\n');
dateList = dateList.replace(/^(.*)[\r\n]*/mg, function (p0, p1) { dateList = dateList.replace(/^(.*)[\r\n]*/mg, function (p0, p1) {
// DEV: innerText doesn't include hidden items var rgxDate = new RegExp('_' + p1 + '\\.zi', 'i');
if (p1 !== 'All' && !~langPanel.innerText.indexOf('_' + p1)) return ''; if (p1 !== 'All' && !rgxDate.test(visibleZIMs)) return '';
return '<option value="' + p1 + '"' + (dateID === p1 ? ' selected' : '') + '>' + p1 + '</option>'; return '<option value="' + p1 + '"' + (dateID === p1 ? ' selected' : '') + '>' + p1 + '</option>';
}); });
dateSel.innerHTML = dateList; dateSel.innerHTML = dateList;
@ -628,7 +629,7 @@ define([], function () {
subjList = subjList.replace(/^(.*)[\r\n]*/mg, function (p0, p1) { subjList = subjList.replace(/^(.*)[\r\n]*/mg, function (p0, p1) {
// DEV: innerText doesn't include hidden items // DEV: innerText doesn't include hidden items
var rgxSubject = new RegExp('_?' + p1 + '[._]', 'i'); var rgxSubject = new RegExp('_?' + p1 + '[._]', 'i');
if (p1 !== 'All' && !rgxSubject.test(langPanel.innerText)) return ''; if (p1 !== 'All' && !rgxSubject.test(visibleZIMs)) return '';
return '<option value="' + p1 + '"' + (subjID === p1 ? ' selected' : '') + '>' + p1 + '</option>'; return '<option value="' + p1 + '"' + (subjID === p1 ? ' selected' : '') + '>' + p1 + '</option>';
}); });
subjSel.innerHTML = subjList; subjSel.innerHTML = subjList;
@ -657,6 +658,7 @@ define([], function () {
if (langID && subjEntries[i].lang !== langID && langID !== "All") subjEntries[i].style.display = "none"; if (langID && subjEntries[i].lang !== langID && langID !== "All") subjEntries[i].style.display = "none";
if (dateID && subjEntries[i].dataset.kiwixdate !== dateID && dateID !== "All") subjEntries[i].style.display = "none"; if (dateID && subjEntries[i].dataset.kiwixdate !== dateID && dateID !== "All") subjEntries[i].style.display = "none";
} }
var visibleZIMs = langPanel.innerText.match(/^.*?\.zi[mp]/mgi);
// Prune the language list // Prune the language list
if (langID === 'All') { if (langID === 'All') {
var langList = langArray.join('\r\n'); var langList = langArray.join('\r\n');
@ -673,8 +675,8 @@ define([], function () {
if (dateID === 'All') { if (dateID === 'All') {
var dateList = dateArray.join('\r\n'); var dateList = dateArray.join('\r\n');
dateList = dateList.replace(/^(.*)[\r\n]*/mg, function (p0, p1) { dateList = dateList.replace(/^(.*)[\r\n]*/mg, function (p0, p1) {
// DEV: innerText doesn't include hidden items var rgxDate = new RegExp('_' + p1 + '\\.zi', 'i');
if (p1 !== 'All' && !~langPanel.innerText.indexOf('_' + p1)) return ''; if (p1 !== 'All' && !rgxDate.test(visibleZIMs)) return '';
return '<option value="' + p1 + '"' + (dateID === p1 ? ' selected' : '') + '>' + p1 + '</option>'; return '<option value="' + p1 + '"' + (dateID === p1 ? ' selected' : '') + '>' + p1 + '</option>';
}); });
dateSel.innerHTML = dateList; dateSel.innerHTML = dateList;
@ -703,6 +705,7 @@ define([], function () {
if (langID && dateEntries[i].lang != langID && langID != "All") dateEntries[i].style.display = "none"; if (langID && dateEntries[i].lang != langID && langID != "All") dateEntries[i].style.display = "none";
if (subjID && dateEntries[i].dataset.kiwixsubject !== subjID && subjID !== "All") dateEntries[i].style.display = "none"; if (subjID && dateEntries[i].dataset.kiwixsubject !== subjID && subjID !== "All") dateEntries[i].style.display = "none";
} }
var visibleZIMs = langPanel.innerText.match(/^.*?\.zi[mp]/mgi);
// Prune the language list // Prune the language list
if (langID === 'All') { if (langID === 'All') {
var langList = langArray.join('\r\n'); var langList = langArray.join('\r\n');
@ -721,7 +724,7 @@ define([], function () {
subjList = subjList.replace(/^(.*)[\r\n]*/mg, function (p0, p1) { subjList = subjList.replace(/^(.*)[\r\n]*/mg, function (p0, p1) {
// DEV: innerText doesn't include hidden items // DEV: innerText doesn't include hidden items
var rgxSubject = new RegExp('_?' + p1 + '[._]', 'i'); var rgxSubject = new RegExp('_?' + p1 + '[._]', 'i');
if (p1 !== 'All' && !rgxSubject.test(langPanel.innerText)) return ''; if (p1 !== 'All' && !rgxSubject.test(visibleZIMs)) return '';
return '<option value="' + p1 + '"' + (subjID === p1 ? ' selected' : '') + '>' + p1 + '</option>'; return '<option value="' + p1 + '"' + (subjID === p1 ? ' selected' : '') + '>' + p1 + '</option>';
}); });
subjSel.innerHTML = subjList; subjSel.innerHTML = subjList;