hiro/tridactyl
1
0
Fork 0
mirror of https://github.com/vale981/tridactyl synced 2025-03-06 01:51:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Clarify where mark help messages come from

Browse source
This commit is contained in:
Oliver Blanthorn 2022-05-06 11:36:36 +02:00
parent d4a3834327
commit fc32cc8e33
No known key found for this signature in database
GPG key ID: 2BB8C36BB504BFF3
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/excmds.ts
View file

@ -1082,9 +1082,9 @@ export async function markjumplocal(key: string) {
if (mark) { if (mark) {
const currentTabId = await activeTabId() const currentTabId = await activeTabId()
state.beforeJumpMark = { url: urlWithoutAnchor, scrollX: window.scrollX, scrollY: window.scrollY, tabId: currentTabId } state.beforeJumpMark = { url: urlWithoutAnchor, scrollX: window.scrollX, scrollY: window.scrollY, tabId: currentTabId }
scrolltab(currentTabId, mark.scrollX, mark.scrollY, `# Jumped to mark '${key}'`) scrolltab(currentTabId, mark.scrollX, mark.scrollY, `# marks: jumped to mark '${key}'`)
} }
return fillcmdline_tmp(3000, `# Warning: local mark '${key}' is not set in this tab`) return fillcmdline_tmp(3000, `# marks: warning - local mark '${key}' is not set in this tab`)
} }
/** /**
@ -1097,7 +1097,7 @@ export async function markjumpglobal(key: string) {
const globalMarks = await State.getAsync("globalMarks") const globalMarks = await State.getAsync("globalMarks")
const mark = globalMarks.get(key) const mark = globalMarks.get(key)
if (!mark) { if (!mark) {
return fillcmdline_tmp(3000, `# Warning: global mark '${key}' is not set`) return fillcmdline_tmp(3000, `# marks: warning - global mark '${key}' is not set`)
} }
const currentTabId = await activeTabId() const currentTabId = await activeTabId()
state.beforeJumpMark = { state.beforeJumpMark = {
@ -1119,7 +1119,7 @@ export async function markjumpglobal(key: string) {
return onTabNoLongerValid() return onTabNoLongerValid()
} }
return goToTab(tab.id).then(() => { return goToTab(tab.id).then(() => {
scrolltab(tab.id, mark.scrollX, mark.scrollY, `# Jumped to mark '${key}'`) scrolltab(tab.id, mark.scrollX, mark.scrollY, `# marks: jumped to mark '${key}'`)
}) })
} }
@ -1139,7 +1139,7 @@ export async function markjumpglobal(key: string) {
function updateMarkAndScroll(tab) { function updateMarkAndScroll(tab) {
mark.tabId = tab.id mark.tabId = tab.id
state.globalMarks = globalMarks state.globalMarks = globalMarks
scrolltab(tab.id, mark.scrollX, mark.scrollY, `# Jumped to mark '${key}'`) scrolltab(tab.id, mark.scrollX, mark.scrollY, `# marks: jumped to mark '${key}'`)
} }
} }
@ -1162,7 +1162,7 @@ export async function markjumpbefore() {
} }
const currentTabId = await activeTabId() const currentTabId = await activeTabId()
state.beforeJumpMark = { url: window.location.href.split("#")[0], scrollX: window.scrollX, scrollY: window.scrollY, tabId: currentTabId } state.beforeJumpMark = { url: window.location.href.split("#")[0], scrollX: window.scrollX, scrollY: window.scrollY, tabId: currentTabId }
goToTab(tabId).then(() => scrolltab(tabId, scrollX, scrollY, "# Jumped back")) goToTab(tabId).then(() => scrolltab(tabId, scrollX, scrollY, "# marks: jumped back"))
} catch (e) { } catch (e) {
// the mark's tab is no longer valid // the mark's tab is no longer valid
} }
@ -1211,7 +1211,7 @@ export async function markaddlocal(key: string) {
localUrlMarks.set(key, newLocalMark) localUrlMarks.set(key, newLocalMark)
localMarks.set(urlWithoutAnchor, localUrlMarks) localMarks.set(urlWithoutAnchor, localUrlMarks)
state.localMarks = localMarks state.localMarks = localMarks
fillcmdline_tmp(3000, `# Local mark '${key}' set`) fillcmdline_tmp(3000, `# marks: local mark '${key}' set`)
} }
/** /**
@ -1226,7 +1226,7 @@ export async function markaddglobal(key: string) {
const newGlobalMark = { url: urlWithoutAnchor, scrollX: window.scrollX, scrollY: window.scrollY, tabId } const newGlobalMark = { url: urlWithoutAnchor, scrollX: window.scrollX, scrollY: window.scrollY, tabId }
globalMarks.set(key, newGlobalMark) globalMarks.set(key, newGlobalMark)
state.globalMarks = globalMarks state.globalMarks = globalMarks
fillcmdline_tmp(3000, `# Global mark '${key}' set`) fillcmdline_tmp(3000, `# marks: global mark '${key}' set`)
} }
/** Called on 'scroll' events. /** Called on 'scroll' events.