mirrors/TidGi-Desktop
1
Fork 0
mirror of https://github.com/tiddly-gittly/TidGi-Desktop.git synced 2026-01-01 06:41:21 -08:00
Code Issues Projects Releases Packages Wiki Activity

Fix preload scripts sometimes are not loaded (#227)

Browse source
This commit is contained in:
Quang Lam 2020-04-28 12:14:16 +07:00 • committed by GitHub
parent 258f7b6679
commit e2f78250fc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

22
public/preload/view.js
View file

@ -15,10 +15,12 @@ const { MenuItem, shell } = remote;
window.global = {};
// eslint-disable-next-line no-console
console.log('Preload script is loading...');
let handled = false;
const handleLoaded = (event) => {
if (handled) return;
// eslint-disable-next-line no-console
console.log(`Preload script is loading on ${event}...`);
const handleLoaded = () => {
const loadDarkReader = () => {
const shouldUseDarkColor = ipcRenderer.sendSync('get-should-use-dark-colors');
const darkReader = ipcRenderer.sendSync('get-preference', 'darkReader');
@ -220,16 +222,16 @@ const handleLoaded = () => {
}
// eslint-disable-next-line no-console
console.log('Preload script is loaded...');
handled = true;
};
// https://stackoverflow.com/a/39993724
// try to load as soon as dom is loaded
document.addEventListener('DOMContentLoaded', () => handleLoaded('document.on("DOMContentLoaded")'));
// if user navigates between the same website
// DOMContentLoaded might not be triggered so double check with 'onload'
// https://github.com/atomery/webcatalog/issues/797
if (document.readyState !== 'loading') {
// document is already ready, just execute code here
handleLoaded();
} else {
document.addEventListener('DOMContentLoaded', handleLoaded);
}
window.addEventListener('load', () => handleLoaded('window.on("onload")'));
// Communicate with the frame
// Have to use this weird trick because contextIsolation: true

34
src/components/dialog-preferences/index.js
View file

@ -1050,23 +1050,6 @@ const Preferences = ({
</Typography>
<Paper elevation={0} className={classes.paper}>
<List dense disablePadding>
<ListItem>
<ListItemText
primary="Use hardware acceleration when available"
/>
<ListItemSecondaryAction>
<Switch
edge="end"
color="primary"
checked={useHardwareAcceleration}
onChange={(e) => {
requestSetPreference('useHardwareAcceleration', e.target.checked);
requestShowRequireRestartDialog();
}}
/>
</ListItemSecondaryAction>
</ListItem>
<Divider />
<ListItem>
<ListItemText
primary="Hibernate unused workspaces at app launch"
@ -1102,6 +1085,23 @@ const Preferences = ({
<ListItemText primary="CSS Code Injection" secondary={cssCodeInjection ? 'Set' : 'Not set'} />
<ChevronRightIcon color="action" />
</ListItem>
<Divider />
<ListItem>
<ListItemText
primary="Use hardware acceleration when available"
/>
<ListItemSecondaryAction>
<Switch
edge="end"
color="primary"
checked={useHardwareAcceleration}
onChange={(e) => {
requestSetPreference('useHardwareAcceleration', e.target.checked);
requestShowRequireRestartDialog();
}}
/>
</ListItemSecondaryAction>
</ListItem>
</List>
</Paper>