pinokiod 3.98.0 → 3.100.0

package/package.json

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

package/server/public/common.js

@@ -1399,8 +1399,12 @@ const open_url2 = (href, target, features) => {
   }
 }
 hotkeys("ctrl+t,cmd+t,ctrl+n,cmd+n", (e) => {
-  open_url2(location.href, "_blank")
-//  window.open("/", "_blank", "self")
+  let agent = document.body.getAttribute("data-agent")
+  if (agent === "electron") {
+    window.open(location.href, "_blank", "pinokio")
+  } else {
+    window.open(location.href, "_blank")
+  }
 })
 const refreshParent = (e) => {
 //  if (window.parent === window.top) {
@@ -1604,7 +1608,12 @@ document.addEventListener("DOMContentLoaded", () => {
   }
   if (document.querySelector("#clone-win")) {
     document.querySelector("#clone-win").addEventListener("click", (e) => {
-      open_url2(location.href, "_blank")
+      let agent = document.body.getAttribute("data-agent")
+      if (agent === "electron") {
+        window.open(location.href, "_blank", "pinokio")
+      } else {
+        window.open(location.href, "_blank")
+      }
     })
   }
 

package/server/public/layout.js

@@ -23,7 +23,7 @@
   const HOST_ORIGIN = window.location.origin;
   const STORAGE_PREFIX = 'pinokio:layout:';
   const MIN_PANEL_SIZE = 120;
-  const GUTTER_SIZE = 6;
+  const GUTTER_SIZE = 4;
 
   const state = {
     sessionId: typeof parsedConfig.sessionId === 'string' && parsedConfig.sessionId.trim() ? parsedConfig.sessionId.trim() : null,

package/server/public/nav.js

@@ -15,11 +15,12 @@ document.addEventListener("DOMContentLoaded", () => {
   if (document.querySelector("#new-window")) {
     document.querySelector("#new-window").addEventListener("click", (e) => {
       let agent = document.body.getAttribute("data-agent")
-      window.open("/", "_blank", "self")
-      /*
+      //window.open("/", "_blank", "self")
       if (agent === "electron") {
-        window.open("/", "_blank", "self")
+        window.open("/", "_blank", "pinokio")
       } else {
+        window.open("/", "_blank")
+        /*
         fetch("/go", {
           method: "POST",
           headers: {
@@ -31,8 +32,8 @@ document.addEventListener("DOMContentLoaded", () => {
         }).then((res) => {
           console.log(res)
         })
+        */
       }
-      */
     })
   }
 })

package/server/public/opener.js

@@ -103,7 +103,12 @@ document.addEventListener("click", async (e) => {
     let features = el.getAttribute("features")
     let href = el.href || el.getAttribute("data-href")
     if (href) {
-      open_url(href, "_blank", features)
+      let agent = document.body.getAttribute("data-agent")
+      if (agent === "electron") {
+        window.open(href, "_blank", "pinokio")
+      } else {
+        window.open(href, "_blank", features)
+      }
     }
 //    if (features && features.includes("app")) {
 //      window.open(el.href, "_blank", features)
@@ -136,8 +141,14 @@ document.addEventListener("click", async (e) => {
     if (el) {
       e.preventDefault()
       e.stopPropagation()
-      let features = el.getAttribute("features")
-      window.open(el.href, "_blank", features)
+      let agent = document.body.getAttribute("data-agent")
+      if (agent === "electron") {
+        window.open(href, "_blank", "pinokio")
+      } else {
+//        window.open(href, "_blank", features)
+        let features = el.getAttribute("features")
+        window.open(el.href, "_blank", features)
+      }
     }
   }
 })

package/server/public/style.css

@@ -290,11 +290,11 @@ body.dark .navheader2 .btn {
   /*
   padding: 10px 0;
   */
-  padding: 0 0 8px;
+  padding: 0 0 5px;
   /*
   background: white;
   */
-  background: #F9F9FB !important;
+  background: #F1F1F1 !important;
 }
 .navheader {
   backdrop-filter: blur(16px);

package/server/views/app.ejs

@@ -148,9 +148,8 @@ body.dark .appcanvas_filler {
   border: none;
 }
 .appcanvas_filler {
-  height: 8px;
-  background: #F9F9FB !important;
-  border-top: 1px solid var(--pinokio-sidebar-tabbar-border);
+  height: 5px;
+  background: #F1F1F1 !important;
 }
 
 .appcanvas > .container {
@@ -393,9 +392,11 @@ body.dark .appcanvas > aside .header-item.selected {
   border-color: var(--pinokio-sidebar-tab-active-bg);
   */
   color: var(--pinokio-sidebar-tab-active-color);
+  /*
   border-color: var(--sidebar-tab-outline);
+  */
   box-shadow: 0 4px 12px var(--pinokio-sidebar-tab-shadow);
-  background: #F9F9FB !important;
+  background: #F1F1F1 !important;
   border-bottom: none;
   z-index: 1;
 }
@@ -695,8 +696,7 @@ body.dark .header-item.cursor {
   cursor: pointer;
 }
 body .frame-link.selected {
-  background: #F9F9FB !important;
-  border: 1px solid rgba(203, 213, 225, 0.7);
+  background: #F1F1F1 !important;
 }
 .frame-link.selected .del {
   color: white;
@@ -1281,8 +1281,7 @@ body.dark #fs-status {
 }
 #fs-status {
   padding: 5px;
-  background: #F9F9FB !important;
-  border-top: 1px solid rgba(203, 213, 225, 0.7);
+  background: #F1F1F1 !important;
   gap: 4px;
   box-sizing: border-box;
   /*
@@ -3386,6 +3385,26 @@ body.dark {
       if (!canonical) {
         return
       }
+      let skip = false
+      try {
+        const parsed = new URL(canonical)
+        const originLower = parsed.origin.toLowerCase()
+        if (originLower === location.origin.toLowerCase()) {
+          skip = true
+        } else {
+          const hostLower = parsed.hostname.toLowerCase()
+          const port = parsed.port || (parsed.protocol === "http:" ? "80" : parsed.protocol === "https:" ? "443" : "")
+          const localHosts = new Set(["localhost", "127.0.0.1", "0.0.0.0", "::1"])
+          if (parsed.protocol === "http:" && port === "42000" && localHosts.has(hostLower)) {
+            skip = true
+          }
+        }
+      } catch (_) {
+        // ignore parse failures but do not skip by default
+      }
+      if (skip) {
+        return
+      }
       if (entryByUrl.has(canonical)) {
         return
       }

package/server/views/d.ejs

@@ -55,8 +55,8 @@ main {
 
   /*
   margin-bottom: 10px;
-  */
   background: rgba(0,0,0,0.05);
+  */
 }
 .tab:hover,
 .tab:focus-visible {