Skip to content

Commit ea913e2

Browse files
author
Mauve Signweaver
committed
fix: Cancel search and find on navigate, table margins
1 parent 7fbfc4e commit ea913e2

File tree

3 files changed

+11
-1
lines changed

3 files changed

+11
-1
lines changed

app/extensions/builtins.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"url": "https://github.com/AgregoreWeb/extension-agregore-history/releases/download/v{version}/agregore-history-v{version}.zip"
55
},
66
"agregore-renderer": {
7-
"version": "2.2.0",
7+
"version": "2.3.0",
88
"url": "https://github.com/AgregoreWeb/extension-agregore-renderer/releases/download/v{version}/agregore-renderer-v{version}.zip"
99
},
1010
"agregore-qr-share": {

app/pages/theme/style.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ details summary::-webkit-details-marker {
118118

119119
table {
120120
border-collapse: collapse;
121+
margin: 1em auto;
121122
}
122123

123124
body>table,

app/ui/script.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ window.searchProvider = searchProvider // Used by omni-box.js
2424

2525
if (rawFrame) nav.classList.toggle('hidden', true)
2626

27+
let searchAborter = null
28+
2729
window.addEventListener('load', () => {
2830
if (noNav) return
2931
console.log('toNavigate', toNavigate)
@@ -56,10 +58,15 @@ search.addEventListener('unfocus', async () => {
5658
})
5759

5860
search.addEventListener('search', async ({ detail }) => {
61+
if(searchAborter) searchAborter.abort()
62+
searchAborter = new AbortController()
63+
const {signal} = searchAborter
64+
5965
const { query, searchID } = detail
6066

6167
search.setSearchResults([], query, searchID)
6268
for await (const result of currentWindow.searchHistory(query)) {
69+
if(signal.aborted) break
6370
search.addSearchResult(result)
6471
}
6572
})
@@ -74,6 +81,8 @@ webview.addEventListener('resize', ({ detail: rect }) => {
7481

7582
currentWindow.on('navigating', (url) => {
7683
search.src = url
84+
find.hide()
85+
if(searchAborter) searchAborter.abort()
7786
})
7887

7988
currentWindow.on('history-buttons-change', updateButtons)

0 commit comments

Comments
 (0)