Tools/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2025-09-01 12:27:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add close tabs link in toast message after saving window's tabs

Browse Source
This commit is contained in:
alteist 2021-02-22 14:35:55 +06:00
parent 6824eb21d4
commit 73d48d8dd5
2 changed files with 39 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
background.js
View File

@ -125,11 +125,12 @@ async function sendMessageToActiveTab(message) {
}
}
function toast(message, noteId = null) {
function toast(message, noteId = null, tabIds = null) {
sendMessageToActiveTab({
name: 'toast',
message: message,
noteId: noteId
noteId: noteId,
tabIds: tabIds
});
}
@ -302,7 +303,11 @@ async function saveTabs() {
return;
}
toast(`${tabs.length} links have been saved to Trilium.`, resp.noteId);
toast(
`${tabs.length} links have been saved to Trilium.`,
resp.noteId,
tabs.map(tab=>{return tab.id})
);
}
browser.contextMenus.onClicked.addListener(async function(info, tab) {
@ -371,6 +376,9 @@ browser.runtime.onMessage.addListener(async request => {
}
}
}
else if (request.name === 'closeTabs') {
return await browser.tabs.remove(request.tabIds)
}
else if (request.name === 'load-script') {
return await browser.tabs.executeScript({file: request.file});
}

42
content.js
View File

@ -209,6 +209,17 @@ function getImages(container) {
return images;
}
function createLink(clickMessage, text, color = "lightskyblue") {
const link = document.createElement('a');
link.href = "javascript:";
link.style.color = color;
link.appendChild(document.createTextNode(text));
link.addEventListener("click", () => {
browser.runtime.sendMessage(null, clickMessage)
});
return link
}
async function prepareMessageResponse(message) {
console.info('Message: ' + message.name);
@ -216,21 +227,24 @@ async function prepareMessageResponse(message) {
let messageText;
if (message.noteId) {
messageText = document.createElement('span');
messageText = document.createElement('p');
messageText.setAttribute("style", "padding: 0; margin: 0")
messageText.appendChild(document.createTextNode(message.message + " "));
openNoteLink = createLink(
{name: 'openNoteInTrilium',noteId: message.noteId},
"Open in Trilium."
)
messageText.appendChild(openNoteLink);
const link = document.createElement('a');
link.href = "javascript:";
link.style.color = "lightskyblue";
link.appendChild(document.createTextNode("Open in Trilium."));
link.addEventListener("click", () => {
browser.runtime.sendMessage(null, {
name: 'openNoteInTrilium',
noteId: message.noteId
})
});
messageText.appendChild(link);
if (message.tabIds) {
messageText.appendChild(document.createElement("br"));
closeTabsLink = createLink(
{name: 'closeTabs', tabIds: message.tabIds},
"Close saved tabs.",
"tomato"
)
messageText.appendChild(closeTabsLink);
}
}
else {
messageText = message.message;
@ -304,4 +318,4 @@ async function requireLib(libPath) {
await browser.runtime.sendMessage({name: 'load-script', file: libPath});
}
}
}