pinokiod 1.0.33 → 1.0.35

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "1.0.33",
+  "version": "1.0.35",
   "description": "",
   "main": "index.js",
   "scripts": {

package/server/views/browser.ejs

@@ -509,26 +509,35 @@ const renderCursor = () => {
   target.classList.add("cursor")
 }
 const nav = (type) => {
-  if (location.hash && location.hash.length > 0) {
-//    let id = getTarget(location.hash.slice(1))
-//    let target = document.querySelector("aside [target='" + id + "']")
-    let id = location.hash.slice(1)
-    let type = id[0]
-    let index = id.slice(1)
-    let target = document.querySelector(`aside .${type} [data-index='${index}']`)
-    let targetFrame = document.querySelector(`iframe[name='${target.target}']`)
-    console.log({ target, targetFrame })
-    if (type === "back") {
-      targetFrame.contentWindow.history.back()
-    } else if (type === "forward") {
-      targetFrame.contentWindow.history.forward()
-    }
-    /*
-    targetFrame.contentWindow.postMessage({
-      action: type
-    }, "*")
-    */
+  let targetFrame = document.querySelector("iframe:not(.hidden)")
+  if (type === "back") {
+    targetFrame.contentWindow.history.back()
+  } else if (type === "forward") {
+    targetFrame.contentWindow.history.forward()
   }
+
+
+
+//  if (location.hash && location.hash.length > 0) {
+////    let id = getTarget(location.hash.slice(1))
+////    let target = document.querySelector("aside [target='" + id + "']")
+//    let id = location.hash.slice(1)
+//    let type = id[0]
+//    let index = id.slice(1)
+//    let target = document.querySelector(`aside .${type} [data-index='${index}']`)
+//    let targetFrame = document.querySelector(`iframe[name='${target.target}']`)
+//    console.log({ target, targetFrame })
+//    if (type === "back") {
+//      targetFrame.contentWindow.history.back()
+//    } else if (type === "forward") {
+//      targetFrame.contentWindow.history.forward()
+//    }
+//    /*
+//    targetFrame.contentWindow.postMessage({
+//      action: type
+//    }, "*")
+//    */
+//  }
 }
 const renderSelection = (e, force) => {
   console.log("# 1")
@@ -823,11 +832,15 @@ renderSelection()
 console.log("loaded after", loaded)
 Reporter()
 document.querySelector("#reload").addEventListener("click", (e) => {
+/*
   // get selected
   let target = document.querySelector(".selected").target
   location.hash = target
   // force refresh
   renderSelection(null, true)
+  */
+  let frame = document.querySelector("iframe:not(.hidden)")
+  frame.contentWindow.location.reload();
 })
 document.querySelector("#back").addEventListener("click", (e) => {
   nav("back")
@@ -859,7 +872,7 @@ document.querySelector("#new-tab").addEventListener("click", async (e) => {
   }
 })
 document.querySelector("#clone-tab").addEventListener("click", async (e) => {
-  const url = e.target.getAttribute("data-href")
+  const url = document.querySelector("#clone-tab").getAttribute("data-href")
   if (url && url.trim().length > 0) {
     console.log("url", url)
     const { tab, frame } = await addTab(url)