pinokiod 3.103.0 → 3.105.0

package/package.json

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

package/server/public/style.css

@@ -278,7 +278,7 @@ body.dark .type-tabs {
   margin-right: 5px;
 }
 body.dark .navheader2 {
-  background: rgba(255,255,255,0.2) !important;
+  background: rgba(255,255,255,0.07) !important;
 }
 body.dark .navheader2 .btn {
   background: rgba(0,0,0,0.4);
@@ -1559,7 +1559,7 @@ body.dark .btn {
   /*
   color: white;
   */
-  background: rgba(255,255,255,0.1) !important;
+  background: rgba(255,255,255,0.1);
   /*
   background: var(--dark-btn-bg);
   */

package/server/views/app.ejs

@@ -18,8 +18,9 @@
   <link href="/electron.css" rel="stylesheet"/>
 <% } %>
 <style>
-body.dark #devtab {
+body.dark #devtab.selected {
   border: none;
+  background: rgba(255,255,255,0.07);
 }
 #devtab {
   align-items: center;
@@ -144,7 +145,7 @@ body.dark .appcanvas {
 }
 */
 body.dark .appcanvas_filler {
-  background: rgba(255,255,255,0.2) !important;
+  background: rgba(255,255,255,0.07) !important;
   border: none;
 }
 .appcanvas_filler {
@@ -370,6 +371,9 @@ body.dark .appcanvas > aside .m.menu .nested-menu > .submenu .frame-link:hover {
   background: none !important;
   border: none;
 }
+body.dark .appcanvas > aside .header-item.btn:not(.selected) {
+  background: none;
+}
 
 .appcanvas > aside .header-item .tab {
   display: flex;
@@ -702,7 +706,7 @@ body .frame-link.selected {
   color: white;
 }
 body.dark .frame-link.selected {
-  background: rgba(255,255,255,0.2) !important;
+  background: rgba(255,255,255,0.07) !important;
 }
 .frame-link .loader {
 /*
@@ -1273,11 +1277,8 @@ body.dark .top-menu .btn2.selected {
 }
 
 body.dark #fs-status {
-/*
-  border-bottom: 1px solid rgba(255,255,255,0.04);
-  */
   border: none;
-  background: rgba(255,255,255,0.2) !important;
+  background: rgba(255,255,255,0.07) !important;
 }
 #fs-status {
   padding: 5px;
@@ -2760,6 +2761,15 @@ body.dark {
       renderSelection({ force: true })
     }, delay)
   }
+  const pluginLaunchActive = (() => {
+    try {
+      const params = new URLSearchParams(window.location.search)
+      return params.has('plugin')
+    } catch (_) {
+      return false
+    }
+  })()
+  let ignorePersistedSelection = pluginLaunchActive
   let lastForegroundSignature = null
   const iframe_onerror = (iframe) => {
     let originalSrc = iframe.src
@@ -4674,10 +4684,16 @@ body.dark {
   const renderSelection = async ({ event: eventParam = null, target: explicitTarget = null, force = false } = {}) => {
     const storage = getWindowStorage()
     const selectionKey = selectionStorageKey()
-    const hasPersistedSelection = Boolean(selectionKey && storage && storage.getItem(selectionKey))
-    const persistedSelectionRaw = selectionKey && storage ? storage.getItem(selectionKey) : null
+    const originalHasPersistedSelection = Boolean(selectionKey && storage && storage.getItem(selectionKey))
+    let persistedSelectionRaw = selectionKey && storage ? storage.getItem(selectionKey) : null
+    const skipPersistedSelection = ignorePersistedSelection
+    let hasPersistedSelection = skipPersistedSelection ? false : originalHasPersistedSelection
+    if (skipPersistedSelection) {
+      persistedSelectionRaw = null
+    }
 
     let target = explicitTarget
+    let preselected = null
 
     if (!target && eventParam) {
       target = eventParam.target?.closest(".frame-link") || null
@@ -4694,7 +4710,14 @@ body.dark {
       }
     }
 
-    if (!target) {
+    if (!target && !skipPersistedSelection) {
+      preselected = document.querySelector('#devtab.frame-link.selected') || document.querySelector('.frame-link.selected')
+      if (preselected) {
+        target = preselected
+      }
+    }
+
+    if (!target && persistedSelectionRaw) {
       target = restorePersistedFrameLink()
       if (!target && persistedSelectionRaw) {
         scheduleSelectionRetry()
@@ -4702,7 +4725,7 @@ body.dark {
       }
     }
 
-    if (!target) {
+    if (!target && !skipPersistedSelection) {
       const urlKey = selectionUrlStorageKey()
       const storedUrl = urlKey && storage ? storage.getItem(urlKey) : null
       if (storedUrl) {
@@ -4710,6 +4733,16 @@ body.dark {
       }
     }
 
+    if (!target && skipPersistedSelection) {
+      const defaultSelection = document.querySelector("[data-default]")
+      if (defaultSelection) {
+        target = defaultSelection
+      } else {
+        scheduleSelectionRetry()
+        return
+      }
+    }
+
     <% if (type === "run" && env.PINOKIO_SCRIPT_DEFAULT && env.PINOKIO_SCRIPT_DEFAULT.toString().toLowerCase() === "true") { %>
       if (!target && !hasPersistedSelection) {
         const defaultSelection = document.querySelector("[data-default]")
@@ -4781,6 +4814,9 @@ body.dark {
       el.classList.remove("selected")
     })
     target.classList.add("selected")
+    if (skipPersistedSelection && target.hasAttribute('data-default')) {
+      ignorePersistedSelection = false
+    }
     persistFrameLinkSelection(target)
 
     // save target.href

package/server/views/pro.ejs

@@ -335,7 +335,7 @@ async function displayResults(config) {
         write(JSON.stringify(packet.data.json2, null, 2).replace(/\n/g, "\r\n"))
         write("\r\n")
       }
-      document.querySelector("#end").scrollIntoView({ behavior: 'smooth' });
+//      document.querySelector("#end").scrollIntoView({ behavior: 'smooth' });
     } else if (packet.type === 'disconnect') {
       term.write("\r\nDisconnected...\r\n")
       socket.close()