pinokiod 0.1.48 → 0.1.50

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "0.1.48",
+  "version": "0.1.50",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -40,7 +40,7 @@
     "multer": "^1.4.5-lts.1",
     "node-downloader-helper": "^2.1.9",
     "node-pty-prebuilt-multiarch-cp": "^0.10.1-pre.48",
-    "pdrive": "^0.0.8",
+    "pdrive": "^0.0.9",
     "portfinder": "^1.0.32",
     "rimraf": "^5.0.0",
     "sanitize-filename": "^1.6.3",

package/server/index.js

@@ -721,6 +721,7 @@ class Server {
           gitRemote,
           filename,
           filepath,
+          encodedFilePath: encodeURIComponent(filepath),
           schemaPath,
           uri,
           mod,

package/server/views/browser.ejs

@@ -48,9 +48,7 @@ body.dark aside {
 aside {
   display: flex;
   flex-direction: column;
-  /*
   width: 200px;
-  */
   overflow: auto;
   box-sizing: border-box;
 }
@@ -215,7 +213,8 @@ body.dark .frame-link.selected {
   /*
   width: 100%;
   */
-  margin-right: 5px;
+  word-break: break-word;
+  margin-right: 10px;
 }
 .frame-link .tab .flexible {
   min-width: 5px;
@@ -424,16 +423,6 @@ const renderSelection = (e, force) => {
     document.querySelector(".bar").classList.remove("hidden")
     let id = getTarget(location.hash.slice(1))
 
-    //document.querySelector("#location").innerHTML = id
-    document.querySelector("#location").innerHTML = location.hash.slice(1)
-
-    if (location.hash.slice(1).startsWith("/")) {
-      document.querySelector("#open-browser").classList.add("hidden")
-    } else {
-      document.querySelector("#open-browser").classList.remove("hidden")
-      //document.querySelector("#open-browser").href = id
-      document.querySelector("#open-browser").href = location.hash.slice(1)
-    }
 
     // select the selected link
 //    document.querySelectorAll(".frame-link").forEach((el) => {
@@ -452,7 +441,27 @@ const renderSelection = (e, force) => {
       }
     }
 
+
+    if (!target) {
+      // find target by id
+      target = document.querySelector("aside [target='" + id + "']")
+    }
+
+    debugger
     if (target) {
+
+      //document.querySelector("#location").innerHTML = id
+      document.querySelector("#location").innerHTML = location.hash.slice(1)
+
+      if (location.hash.slice(1).startsWith("/")) {
+        document.querySelector("#open-browser").classList.add("hidden")
+      } else {
+        document.querySelector("#open-browser").classList.remove("hidden")
+        //document.querySelector("#open-browser").href = id
+        document.querySelector("#open-browser").href = location.hash.slice(1)
+      }
+
+
       target.classList.add("selected")
 
       // select the iframe
@@ -474,9 +483,9 @@ const renderSelection = (e, force) => {
             }
           } else {
             if (force) {
-              if (targetFrame.src !== target.href) {
+//              if (targetFrame.src !== target.href) {
                 targetFrame.src = target.href
-              }
+//              }
             }
           }
         } else {
@@ -499,6 +508,11 @@ const renderSelection = (e, force) => {
         document.querySelector("main").appendChild(frame)
         loaded[target.target] = true
       }
+    } else {
+      // couldn't find item,
+      // clear the hash
+      // 
+      location.hash = ""
     }
   } else {
     document.querySelector(".bar").classList.add("hidden")

package/server/views/fullscreen_editor.ejs

@@ -664,7 +664,7 @@ document.addEventListener("DOMContentLoaded", async () => {
   */
 })
 const reloadMemory = async () => {
-  let url = "/pinokio/memory?filepath=" + encodeURI("<%-filepath%>")
+  let url = "/pinokio/memory?filepath=<%=encodedFilePath%>"
   console.log("Url", url)
   let memory = await fetch(url).then((res) => {
     return res.json()