refactor(defaultTheme): simplify script logic

Author: marjune163

src/tpl/defaultTheme/frontend/index.js

@@ -19,7 +19,6 @@
 
 	const Enter = 'Enter';
 	const Escape = 'Escape';
-	const Esc = 'Esc';
 	const Space = ' ';
 
 	let hasStorage = false;
@@ -109,16 +108,12 @@
 		};
 
 		input.addEventListener('keydown', function (e) {
-			switch (e.key) {
-				case Enter:
-					onEnter();
-					e.preventDefault();
-					break;
-				case Escape:
-				case Esc:
-					onEscape();
-					e.preventDefault();
-					break;
+			if (e.key === Enter) {
+				onEnter();
+				e.preventDefault();
+			} else if (e.key === Escape) {
+				onEscape();
+				e.preventDefault();
 			}
 		});
 		clear.addEventListener('click', function () {
@@ -137,8 +132,9 @@
 			}
 
 			window.addEventListener('pagehide', function () {
-				if (input.value) {
-					sessionStorage.setItem(location.pathname, input.value);
+				const inputValue = input.value;
+				if (inputValue) {
+					sessionStorage.setItem(location.pathname, inputValue);
 				}
 			});
 		}
@@ -150,8 +146,7 @@
 	function keepFocusOnBackwardForward() {
 		function onFocus(e) {
 			const link = e.target.closest('a');
-			if (!link || link === lastFocused) return;
-			lastFocused = link;
+			if (link && link !== lastFocused) lastFocused = link;
 		}
 
 		const itemList = document.body.querySelector(selectorItemList);
@@ -212,6 +207,7 @@
 			lastFocused = elLink;
 			elLink.focus();
 			elLink.scrollIntoView({block: 'center'});
+			break;
 		}
 	}
 
@@ -223,16 +219,14 @@
 		}
 
 		function getFocusableSibling(container, isBackward, startA) {
+			if (!container.childElementCount) return;
 			if (!startA) {
 				startA = container.querySelector(':focus');
 			}
 			let startLI = startA && startA.closest('li');
 			if (!startLI) {
 				startLI = isBackward ? container.firstElementChild : container.lastElementChild;
 			}
-			if (!startLI) {
-				return;
-			}
 
 			let siblingLI = startLI;
 			do {
@@ -970,36 +964,28 @@
 
 			const form = e.target;
 
-			function onLoad() {
-				const status = this.status;
-				if (status >= 200 && status < 300) {
-					const elItem = form.closest('li');
-					elItem.remove();
-				} else {
-					logError(`delete failed: ${status} ${this.statusText}`);
-				}
-			}
-
-			let params = '';
-			const els = Array.from(form.elements);
-			for (let i = 0; i < els.length; i++) {
-				if (!els[i].name) {
-					continue
-				}
-				if (params.length > 0) {
-					params += '&'
-				}
-				params += els[i].name + '=' + encodeURIComponent(els[i].value)
-			}
-			const url = form.action;
+			const params = Array.from(form.elements).map(el => {
+				const {name, value} = el
+				if (name) {
+					return `${name}=${encodeURIComponent(value)}`;
+				}
+			}).filter(Boolean).join('&');
+
+			// follow redirect to update bf-cache
+			fetch(form.action, {
+				method: form.method,
+				headers: {
+					'Content-Type': form.enctype,
+				},
+				body: params
+			}).then(resp => {
+				const {status} = resp;
+				if (status < 200 || status > 299) throw resp;
+				const elItem = form.closest('li');
+				elItem.remove();
+			}).catch(logError);
 
-			const xhr = new XMLHttpRequest();
-			xhr.open('POST', url);	// will retrieve deleted result into bfcache
-			xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
-			xhr.addEventListener('load', onLoad);
-			xhr.send(params);
 			e.preventDefault();
-			return false;
 		});
 	}