Clearer order of operations

[hnim.git] / hnim.js

diff --git a/hnim.js b/hnim.js
index 002e0e4..7ac3f5d 100644 (file)
--- a/hnim.js
+++ b/hnim.js
@@ -1,72 +1,85 @@
 (() => {
-  const comments = document.querySelector(".comment-tree > tbody");
+  const comments = document.querySelectorAll("tr.comtr");
+  const items = document.querySelectorAll("table.itemlist tr.athing");
+  const morelink = document.querySelectorAll("a.morelink");
+
+  const elements = [
+    ...Array.from(items),
+    ...Array.from(comments),
+    ...Array.from(morelink),
+  ];
   
-  let selectedComment = comments.firstElementChild
-  selectedComment.style.outline = '1px dashed black';
+  let elementsIndex = 0;
+  let selectedElement = elements[elementsIndex];
+  selectedElement.style.outline = '1px dashed black';
 
   const visible = (element) => {
     let bounds = element.getBoundingClientRect();
-    return bounds.top >= 0 && bounds.bottom <= window.innerHeight;
+    return Math.abs(bounds.bottom - bounds.top) > window.innerHeight || (bounds.top >= 0 && bounds.bottom <= window.innerHeight);
   }
 
   const changeWithVisibleCallback = (comment, callback) => {
     if (comment == null) {
       return;
     }
-    selectedComment.style.outline = '';
-    selectedComment = comment;
-    selectedComment.style.outline = '1px dashed black';
-    if (!visible(comment)) {
+    selectedElement.style.outline = '';
+    selectedElement = comment;
+    selectedElement.style.outline = '1px dashed black';
+    while (!visible(comment)) {
       callback();
     }
   }
 
   const change = (comment) => {
+    elementsIndex = elements.indexOf(comment);
     changeWithVisibleCallback(comment, () => {});
   }
 
   // Curry callback for moving downpage
-  const changeDownpage = (comment) => {
-    changeWithVisibleCallback(comment, () => {window.scrollTo(0, window.scrollY + comment.offsetHeight)});
+  const changeDownpage = () => {
+    elementsIndex = Math.min(elementsIndex + 1, elements.length - 1);
+    changeWithVisibleCallback(elements[elementsIndex], () => {window.scrollTo(0, window.scrollY + selectedElement.offsetHeight)});
   }
 
   // Curry callback for moving up page
-  const changeUppage = (comment) => {
-    changeWithVisibleCallback(comment, () => {window.scrollTo(0, window.scrollY - comment.offsetHeight)});
+  const changeUppage = () => {
+    elementsIndex = Math.max(elementsIndex - 1, 0);
+    changeWithVisibleCallback(elements[elementsIndex], () => {window.scrollTo(0, window.scrollY - selectedElement.offsetHeight)});
   }
 
   document.addEventListener("click", (e) => {
     change(e.target.closest("tr.athing"));
   })
   document.addEventListener("keydown", (e) => {
-    if (e.isComposing) {
+    if (e.target.type === 'textarea' || e.isComposing) {
       return;
     }
     switch (e.key) {
       case "j":
         do {
-          changeDownpage(selectedComment.nextElementSibling);
-        } while (selectedComment.classList.contains("noshow"));
+          changeDownpage();
+        } while (selectedElement.classList.contains("noshow"));
         break;
       case "k":
         do {
-          changeUppage(selectedComment.previousElementSibling);
-        } while (selectedComment.classList.contains("noshow"));
+          changeUppage();
+        } while (selectedElement.classList.contains("noshow"));
         break;
       case "m":
       case "Enter":
-        let togg = selectedComment.querySelector(".togg");
-        let more = selectedComment.querySelector(".morelink");
+        let togg = selectedElement.querySelector(".togg");
         if (togg) {
           togg.click();
         }
-        else if (more) {
-          more.click();
+        else if (elementsIndex == elements.length - 1) {
+          selectedElement.click();
         }
         break;
+      case "o":
+        window.location.href = "https://news.ycombinator.com/item?id=" + selectedElement.id;
       case "p":
-        while (selectedComment.querySelector("td.ind").firstElementChild.width != 0) {
-          changeUppage(selectedComment.previousElementSibling);
+        while (selectedElement.querySelector("td.ind").firstElementChild.width != 0) {
+          changeUppage();
         }
         break;
       default: