improve some null handling
This commit is contained in:
parent
e89970d339
commit
38120bc60f
1 changed files with 20 additions and 22 deletions
|
@ -6,43 +6,38 @@ let skipAll: HTMLInputElement;
|
|||
|
||||
const opened: Set<string> = new Set;
|
||||
|
||||
function openCW(id: string | null, caption: HTMLElement | null,
|
||||
focusLink = false) {
|
||||
function openCW(id: string | null, caption: HTMLElement, focusLink = false): void {
|
||||
if (id !== null) opened.add(id);
|
||||
if (caption !== null) mainfig.removeChild(caption);
|
||||
if (caption.parentElement) {
|
||||
mainfig.removeChild(caption);
|
||||
}
|
||||
mainlink.tabIndex = 0;
|
||||
if (focusLink) mainlink.focus();
|
||||
}
|
||||
|
||||
function addCWListeners(id: string | null,
|
||||
caption: HTMLElement | null) {
|
||||
if (caption) {
|
||||
function addCWListeners(id: string | null, caption: HTMLElement): void {
|
||||
caption.addEventListener('click', _e => openCW(id, caption));
|
||||
caption.addEventListener('keyup',
|
||||
e => { if (e.key == 'Enter') openCW(id, caption, true) });
|
||||
}
|
||||
}
|
||||
|
||||
function setImage(id: string | null,
|
||||
src: string,
|
||||
href: string,
|
||||
cw: string) {
|
||||
function setImage(id: string, src: string, href: string, cw: string): void {
|
||||
const caption = document.getElementById('cw');
|
||||
const checked = skipAll ? skipAll.checked : false;
|
||||
|
||||
if (!checked && !opened.has(id) && cw) {
|
||||
const template = document.getElementById('cw-template') as HTMLTemplateElement;
|
||||
newCaption = template.content.firstElementChild!.cloneNode(true) as HTMLElement;
|
||||
const newCaption = template.content.firstElementChild!.cloneNode(true) as HTMLElement;
|
||||
newCaption.querySelector('#cw-text')!.innerHTML = cw;
|
||||
addCWListeners(id, newCaption);
|
||||
}
|
||||
|
||||
if (caption) {
|
||||
openCW(null, caption);
|
||||
}
|
||||
if (newCaption !== null) {
|
||||
if (caption) openCW(null, caption);
|
||||
|
||||
mainfig.insertBefore(newCaption, mainlink);
|
||||
mainlink.tabIndex = -1;
|
||||
|
||||
addCWListeners(id, newCaption);
|
||||
} else {
|
||||
if (caption) openCW(null, caption);
|
||||
}
|
||||
|
||||
mainimg.src = src;
|
||||
|
@ -74,7 +69,10 @@ function useFragment(firstLoad = false): void {
|
|||
activateButton(button, false);
|
||||
}
|
||||
|
||||
if (firstLoad) addCWListeners(id, document.getElementById('cw'));
|
||||
if (firstLoad) {
|
||||
const cw = document.getElementById('cw');
|
||||
if (cw) addCWListeners(id, cw);
|
||||
}
|
||||
}
|
||||
|
||||
function setup() {
|
||||
|
|
Loading…
Reference in a new issue