${data.description || ''}
- `; - } else { - newSite.innerHTML = ` - -${data.description || ''}
- `; - } + const cfg = + window.MeNav && typeof window.MeNav.getConfig === 'function' + ? window.MeNav.getConfig() + : null; + iconsMode = (cfg && (cfg.data?.icons?.mode || cfg.icons?.mode)) || 'favicon'; } catch (e) { - newSite.innerHTML = ` - -${data.description || ''}
- `; + iconsMode = 'favicon'; } + if (iconsMode === 'favicon' && data.url && /^https?:\/\//i.test(data.url)) { + const faviconUrl = `https://t3.gstatic.com/faviconV2?client=SOCIAL&type=FAVICON&fallback_opts=TYPE,SIZE,URL&url=${encodeURIComponent(data.url)}&size=32`; + + const iconContainer = document.createElement('div'); + iconContainer.className = 'icon-container'; + + const placeholder = document.createElement('i'); + placeholder.className = 'fas fa-circle-notch fa-spin icon-placeholder'; + placeholder.setAttribute('aria-hidden', 'true'); + + const fallback = document.createElement('i'); + fallback.className = `${siteIcon} icon-fallback`; + fallback.setAttribute('aria-hidden', 'true'); + + const favicon = document.createElement('img'); + favicon.className = 'favicon-icon'; + favicon.src = faviconUrl; + favicon.alt = `${siteName} favicon`; + favicon.loading = 'lazy'; + favicon.addEventListener('load', () => { + favicon.classList.add('loaded'); + placeholder.classList.add('hidden'); + }); + favicon.addEventListener('error', () => { + favicon.classList.add('error'); + placeholder.classList.add('hidden'); + fallback.classList.add('visible'); + }); + + iconContainer.appendChild(placeholder); + iconContainer.appendChild(favicon); + iconContainer.appendChild(fallback); + iconWrapper.appendChild(iconContainer); + } else { + const iconEl = document.createElement('i'); + iconEl.className = `${siteIcon} site-icon`; + iconEl.setAttribute('aria-hidden', 'true'); + iconWrapper.appendChild(iconEl); + } + + newSite.appendChild(iconWrapper); + newSite.appendChild(contentWrapper); + // 添加到DOM sitesGrid.appendChild(newSite); @@ -222,13 +305,13 @@ window.MeNav = { // 触发元素添加事件 this.events.emit('elementAdded', { - id: data.name, + id: siteName, type: 'site', parentId: parentId, data: data }); - return data.name; + return siteName; } else if (type === 'category') { // 查找父级页面容器 parent = document.querySelector(`[data-container="categories"]`); @@ -772,6 +855,28 @@ document.addEventListener('DOMContentLoaded', () => { searchToggle.addEventListener('click', toggleSearch); overlay.addEventListener('click', closeAllPanels); + // 全局快捷键：Ctrl/Cmd + K 聚焦搜索 + document.addEventListener('keydown', e => { + const key = (e.key || '').toLowerCase(); + if (key !== 'k') return; + if ((!e.ctrlKey && !e.metaKey) || e.altKey) return; + + const target = e.target; + const isTypingTarget = + target && + (target.tagName === 'INPUT' || target.tagName === 'TEXTAREA' || target.isContentEditable); + + if (isTypingTarget && target !== searchInput) return; + + e.preventDefault(); + + if (isMobile() && !isSearchOpen) { + toggleSearch(); + } + + searchInput && searchInput.focus(); + }); + // 检查是否是移动设备 function isMobile() { return window.innerWidth <= 768; diff --git a/templates/components/site-card.hbs b/templates/components/site-card.hbs index ab9fa91..e5ecf07 100644 --- a/templates/components/site-card.hbs +++ b/templates/components/site-card.hbs @@ -6,27 +6,32 @@ data-url="{{url}}" data-icon="{{#if icon}}{{icon}}{{else}}fas fa-link{{/if}}" data-description="{{#if description}}{{description}}{{else}}{{extractDomain url}}{{/if}}"> - {{#ifEquals @root.icons.mode "favicon"}} - {{#ifHttpUrl url}} -{{#if description}}{{description}}{{else}}{{extractDomain url}}{{/if}}
+