Merge branch 'develop'
This commit is contained in:
commit
a1e63c9e20
@ -50,7 +50,7 @@
|
||||
|
||||
<div id="services">
|
||||
<div class="loader"></div>
|
||||
<div id="url-preview" class="hidden"></div>
|
||||
<div id="url-preview" class="invisible"></div>
|
||||
<div id="empty-message">Load a service using the menu on the left.</div>
|
||||
</div>
|
||||
</body>
|
||||
|
@ -12,6 +12,10 @@ body {
|
||||
flex-direction: column;
|
||||
height: 100%;
|
||||
width: var(--nav-width);
|
||||
|
||||
body.fullscreen & {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
|
||||
#navigation > :not(#service-buttons) {
|
||||
@ -298,6 +302,7 @@ body {
|
||||
|
||||
#url-preview {
|
||||
position: absolute;
|
||||
z-index: 10000;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
display: block;
|
||||
@ -329,7 +334,7 @@ body {
|
||||
border-radius: 5px 0 0 0;
|
||||
}
|
||||
|
||||
#url-preview.hidden {
|
||||
#url-preview.invisible {
|
||||
opacity: 0;
|
||||
}
|
||||
|
||||
|
@ -587,9 +587,9 @@ function loadService(serviceId: number, service: any) {
|
||||
// Display target urls
|
||||
service.view.addEventListener('update-target-url', (event: UpdateTargetUrlEvent) => {
|
||||
if (event.url.length === 0) {
|
||||
urlPreview?.classList.add('hidden');
|
||||
urlPreview?.classList.add('invisible');
|
||||
} else {
|
||||
urlPreview?.classList.remove('hidden');
|
||||
urlPreview?.classList.remove('invisible');
|
||||
if (urlPreview) {
|
||||
urlPreview.innerHTML = event.url;
|
||||
}
|
||||
@ -834,4 +834,9 @@ function setContextMenu(webContents: WebContents) {
|
||||
window: remote.getCurrentWindow(),
|
||||
});
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
ipcRenderer.on('fullscreenchange', (e, fullscreen) => {
|
||||
if (fullscreen) document.body.classList.add('fullscreen');
|
||||
else document.body.classList.remove('fullscreen');
|
||||
});
|
||||
|
14
package.json
14
package.json
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "tabs",
|
||||
"version": "1.1.2",
|
||||
"version": "1.1.3",
|
||||
"description": "Persistent and separate browser tabs in one window.",
|
||||
"author": {
|
||||
"name": "Alice Gaudon",
|
||||
@ -29,7 +29,7 @@
|
||||
"@babel/core": "^7.9.6",
|
||||
"@babel/preset-env": "^7.9.6",
|
||||
"@fortawesome/fontawesome-free": "^5.13.0",
|
||||
"@types/node": "^12.12.41",
|
||||
"@types/node": "^12.12.48",
|
||||
"babel-loader": "^8.1.0",
|
||||
"concurrently": "^5.2.0",
|
||||
"copy-webpack-plugin": "^6.0.1",
|
||||
@ -39,14 +39,14 @@
|
||||
"file-loader": "^6.0.0",
|
||||
"imagemin": "^7.0.1",
|
||||
"imagemin-gifsicle": "^7.0.0",
|
||||
"imagemin-mozjpeg": "^8.0.0",
|
||||
"imagemin-pngquant": "^8.0.0",
|
||||
"imagemin-mozjpeg": "^9.0.0",
|
||||
"imagemin-pngquant": "^9.0.0",
|
||||
"imagemin-svgo": "^8.0.0",
|
||||
"img-loader": "^3.0.1",
|
||||
"mini-css-extract-plugin": "^0.9.0",
|
||||
"node-sass": "^4.14.1",
|
||||
"sass-loader": "^8.0.2",
|
||||
"ts-loader": "^7.0.4",
|
||||
"sass-loader": "^9.0.2",
|
||||
"ts-loader": "^8.0.0",
|
||||
"typescript": "^3.9.3",
|
||||
"webpack": "^4.43.0",
|
||||
"webpack-cli": "^3.3.11"
|
||||
@ -99,6 +99,6 @@
|
||||
}
|
||||
]
|
||||
},
|
||||
"electronVersion": "9.0.5"
|
||||
"electronVersion": "9.1.0"
|
||||
}
|
||||
}
|
||||
|
@ -129,6 +129,13 @@ export default class MainWindow extends Window {
|
||||
}
|
||||
});
|
||||
|
||||
window.on('enter-full-screen', () => {
|
||||
window.webContents.send('fullscreenchange', true);
|
||||
});
|
||||
window.on('leave-full-screen', () => {
|
||||
window.webContents.send('fullscreenchange', false);
|
||||
});
|
||||
|
||||
// Load navigation view
|
||||
window.loadFile(path.resolve(Meta.RESOURCES_PATH, 'index.html'))
|
||||
.catch(console.error);
|
||||
|
Loading…
Reference in New Issue
Block a user