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

Fix :editor failing to remove TridactylEditing class on failure

Browse source 
Before this commit, if Tridactyl failed to execute :editor (e.g. because
editorcmd isn't defined), the edited element would keep its
TridactylEditing class.

Closes https://github.com/tridactyl/tridactyl/issues/1298
This commit is contained in:
glacambre 2019-01-28 07:13:25 +01:00
parent 95be91b687
commit 17bff13d37
No known key found for this signature in database
GPG key ID: B9625DB1767553AC
1 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/excmds.ts
View file

@ -271,16 +271,28 @@ export async function editor() {
let tab = await activeTab()
let selector = await Messaging.messageTab(tab.id, "excmd_content", "getInputSelector", [])
let classUpdate = Messaging.messageTab(tab.id, "excmd_content", "addTridactylEditorClass", [selector])
let url = new URL(tab.url)
if (!(await Native.nativegate())) return
const file = (await Native.temp(await getinput(), url.hostname)).content
const content = (await Native.editor(file)).content
// We're using Messaging.messageTab instead of `fillinput()` because fillinput() will execute in the currently active tab, which might not be the tab the user spawned the editor in
Messaging.messageTab(tab.id, "excmd_content", "fillinput", [selector, content])
// Make sure the class has been added before removing it
classUpdate.then(() => Messaging.messageTab(tab.id, "excmd_content", "removeTridactylEditorClass", [selector]))
// TODO: add annoying "This message was written with [Tridactyl](https://addons.mozilla.org/en-US/firefox/addon/tridactyl-vim/)" to everything written using editor
return [file, content]
// removeClass makes sure the class has been added before removing it
let removeClass = () => classUpdate.then(() => Messaging.messageTab(tab.id, "excmd_content", "removeTridactylEditorClass", [selector]))
if (!(await Native.nativegate())) {
removeClass()
return undefined
}
try {
const url = new URL(tab.url)
const file = (await Native.temp(await getinput(), url.hostname)).content
const content = (await Native.editor(file)).content
// We're using Messaging.messageTab instead of `fillinput()` because fillinput() will execute in the currently active tab, which might not be the tab the user spawned the editor in
Messaging.messageTab(tab.id, "excmd_content", "fillinput", [selector, content])
// TODO: add annoying "This message was written with [Tridactyl](https://addons.mozilla.org/en-US/firefox/addon/tridactyl-vim/)" to everything written using editor
return [file, content]
} catch (e) {
throw `:editor failed: ${e}`
} finally {
removeClass()
}
}
//#background_helper