ashpie/tabs
ashpie/tabs
1
0
Fork 0
Code Issues 12 Pull Requests Releases 49 Wiki Activity

Add the ability to close (unload) a service

Browse Source
This commit is contained in:
Alice Gaudon 2020-01-07 12:02:39 +01:00
parent 670e4cf6f8
commit 3698030eb5
2 changed files with 40 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
resources/index.html
View File

@ -51,6 +51,12 @@
// Service context menu // Service context menu
const serviceContextMenu = new Menu(); const serviceContextMenu = new Menu();
serviceContextMenu.append(new MenuItem({
label: 'Close', click: () => {
unloadService(serviceContextMenu.serviceId);
}
}));
serviceContextMenu.append(new MenuItem({type: "separator"}));
serviceContextMenu.append(new MenuItem({ serviceContextMenu.append(new MenuItem({
label: 'Edit', click: () => { label: 'Edit', click: () => {
ipcRenderer.send('openServiceSettings', serviceContextMenu.serviceId); ipcRenderer.send('openServiceSettings', serviceContextMenu.serviceId);
@ -219,7 +225,7 @@
}); });
function setActiveService(serviceId) { function setActiveService(serviceId) {
let currentService = services[serviceId]; const currentService = services[serviceId];
process.nextTick(() => { process.nextTick(() => {
loadService(serviceId, currentService); loadService(serviceId, currentService);
@ -241,7 +247,8 @@
function loadService(serviceId, service) { function loadService(serviceId, service) {
// Load service if not loaded yet // Load service if not loaded yet
if (!service.view) { if (!service.view && !service.viewReady) {
document.querySelector('#services > .loader').classList.remove('hidden');
service.view = document.createElement('webview'); service.view = document.createElement('webview');
service.view.setAttribute('src', service.url); service.view.setAttribute('src', service.url);
service.view.setAttribute('partition', 'persist:service_' + service.partition); service.view.setAttribute('partition', 'persist:service_' + service.partition);
@ -249,8 +256,10 @@
document.querySelector('#services').appendChild(service.view); document.querySelector('#services').appendChild(service.view);
service.view.addEventListener('dom-ready', () => { service.view.addEventListener('dom-ready', () => {
service.viewReady = true; document.querySelector('#services > .loader').classList.add('hidden');
updateNavigation(); updateNavigation();
service.li.classList.add('loaded');
service.viewReady = true;
}); });
service.view.addEventListener('page-favicon-updated', event => { service.view.addEventListener('page-favicon-updated', event => {
console.debug('Loaded favicons for', service.name, event.favicons); console.debug('Loaded favicons for', service.name, event.favicons);
@ -267,8 +276,29 @@
} }
} }
}); });
}
}
service.li.classList.add('loaded'); function unloadService(serviceId) {
const service = services[serviceId];
if (service.view && service.viewReady) {
service.view.remove();
service.view = null;
service.li.classList.remove('loaded');
service.viewReady = false;
if (parseInt(selectedService) === serviceId) {
selectedService = null;
for (let i = 0; i < services.length; i++) {
if (services[i].view && services[i].viewReady) {
setActiveService(i);
break;
}
}
if (selectedService === null) {
updateNavigation();
}
}
} }
} }
@ -276,7 +306,7 @@
console.debug('Updating navigation'); console.debug('Updating navigation');
// Update active list element // Update active list element
for (let i = 0; i < services.length; i++) { for (let i = 0; i < services.length; i++) {
let service = services[i]; const service = services[i];
if (parseInt(selectedService) === i) { if (parseInt(selectedService) === i) {
service.li.classList.add('active'); service.li.classList.add('active');
} else { } else {
@ -284,7 +314,7 @@
} }
} }
if (services[selectedService].viewReady) { if (selectedService !== null && services[selectedService].viewReady) {
console.debug('Updating navigation buttons because view is ready'); console.debug('Updating navigation buttons because view is ready');
// Update history navigation // Update history navigation
let view = services[selectedService].view; let view = services[selectedService].view;

4
resources/layout.css
View File

@ -51,3 +51,7 @@ body {
transform: rotate(360deg); transform: rotate(360deg);
} }
} }
.hidden {
display: none;
}