fix: opening cached windows

Replace 'undo' icon with 'window'.
Rename the option from 'Reopen' to 'Open'.
Denormalize url placeholders into original urls.
Remove http scheme prefix from titles.

Author: mbnuqw

build/copy.js

@@ -19,7 +19,6 @@ const COPY = {
   './src/assets/group-page-favicon.svg': `${ADDON_PATH}/assets/`,
   './src/assets/snapshot-native.svg': `${ADDON_PATH}/assets/`,
   './src/assets/proxy-native.svg': `${ADDON_PATH}/assets/`,
-  './src/assets/undo-native.svg': `${ADDON_PATH}/assets/`,
   './src/assets/window-native.svg': `${ADDON_PATH}/assets/`,
   './src/assets/private-window-native.svg': `${ADDON_PATH}/assets/`,
   [`./node_modules/vue/dist/${VUE_DIST}`]: `${ADDON_PATH}/vendor/`,

src/_locales/dict.common.ts

@@ -1078,16 +1078,16 @@ export const commonTranslations: Translations = {
   },
   'menu.browserAction.reopen_cached_win_first': {
     en: tabsCount => {
-      if (tabsCount === 1) return `Reopen cached window (${tabsCount} tab)`
-      return `Reopen cached window (${tabsCount} tabs)`
+      if (tabsCount === 1) return `Open cached window (${tabsCount} tab)`
+      return `Open cached window (${tabsCount} tabs)`
     },
-    zh_CN: tabsCount => `重开已缓存窗口（${tabsCount} 个标签页）`,
-    zh_TW: tabsCount => `重開已快取視窗（${tabsCount} 個分頁）`,
+    zh_CN: tabsCount => `打开缓存窗口（${tabsCount} 个标签页）`,
+    zh_TW: tabsCount => `開啟快取視窗（${tabsCount} 個分頁）`,
   },
   'menu.browserAction.reopen_cached_wins': {
-    en: 'Reopen cached window',
-    zh_CN: '重开已缓存窗口',
-    zh_TW: '重開已快取視窗',
+    en: 'Open cached window',
+    zh_CN: '打开缓存窗口',
+    zh_TW: '開啟快取視窗',
   },
   'menu.browserAction.reopen_cached_win': {
     en: (tabsCount, panelsCount) => {

src/assets/undo-native.svg

@@ -94,7 +94,7 @@ export async function importCtxMenu(ctxMenu: MenuConfs) {
 
 export function createBrowserActionMenu() {
   createSettingsMenu()
-  TabsBg.createReopenFromCacheMenu()
+  TabsBg.createOpenFromCacheMenu()
 }
 
 export function createSettingsMenu(): void {

src/services/menu.actions.ts

@@ -83,7 +83,7 @@ export async function reinitTabs(msg: string) {
   await loadTabs()
 }
 
-export function createReopenFromCacheMenu() {
+export function createOpenFromCacheMenu() {
   // No cache
   if (!_tabsDataCache) return
 
@@ -95,8 +95,8 @@ export function createReopenFromCacheMenu() {
     browser.menus.create({
       id: 'reopen_cached_win',
       title: translate('menu.browserAction.reopen_cached_win_first', winCache.length),
-      icons: { '16': 'assets/undo-native.svg' },
-      onclick: () => reopenCachedWindow(winCache),
+      icons: { '16': 'assets/window-native.svg' },
+      onclick: () => openCachedWindow(winCache),
       contexts: ['browser_action'],
     })
   }
@@ -106,7 +106,7 @@ export function createReopenFromCacheMenu() {
     const parentId = browser.menus.create({
       id: 'reopen_cached_wins',
       title: translate('menu.browserAction.reopen_cached_wins'),
-      icons: { '16': 'assets/undo-native.svg' },
+      icons: { '16': 'assets/window-native.svg' },
       contexts: ['browser_action'],
     })
 
@@ -127,21 +127,21 @@ export function createReopenFromCacheMenu() {
         parentId,
         title: translate('menu.browserAction.reopen_cached_win', winCache.length, panelIds.size),
         icons: { '16': icon },
-        onclick: () => reopenCachedWindow(winCache),
+        onclick: () => openCachedWindow(winCache),
         contexts: ['browser_action'],
       })
     }
   }
 }
 
-function reopenCachedWindow(cache: TabCache[]) {
+function openCachedWindow(cache: TabCache[]) {
   const incognito = !!cache[0]?.privWin
   const items: ItemInfo[] = []
   for (const cachedTab of cache) {
     items.push({
       id: cachedTab.id,
-      url: cachedTab.url,
-      title: cachedTab.customTitle ?? cachedTab.url,
+      url: Utils.denormalizeUrl(cachedTab.url),
+      title: cachedTab.customTitle ?? cachedTab.url.replace(/^https?:\/\//, ''),
       parentId: cachedTab.parentId ?? NOID,
       panelId: cachedTab.panelId ?? NOID,
       pinned: !!cachedTab.pin,