beenull/ente
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Remove (kindof) unused reloadWindow IPC

Browse source 
We now bundle the renderer code within the app. So a load-fail indicates
something really wrong, not something we can deal with upfront (the code wasn't
probably even working - e.g. it was assigning to a function parameter
mainWindow, not the actual global var behind it).
This commit is contained in:
Manav Rathi 2024-03-15 21:43:05 +05:30
parent 3a6c7b2dcd
commit b3289f2b8d
No known key found for this signature in database
5 changed files with 0 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
desktop/build/error.html
View file

@ -1,30 +0,0 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>ente Photos</title>
</head>
<body style="background-color: black">
<div
style="
height: 95vh;
width: 96vw;
display: grid;
place-items: center;
color: white;
"
>
<div>
<div style="margin-bottom: 10px">
Site unreachable, please try again later
</div>
<button onClick="window[`ElectronAPIs`].reloadWindow()">
Reload
</button>
</div>
</div>
</body>
</html>

4
desktop/src/api/system.ts
View file

@ -1,10 +1,6 @@
import { ipcRenderer } from "electron";
import { AppUpdateInfo } from "../types";
export const reloadWindow = () => {
ipcRenderer.send("reload-window");
};
export const registerUpdateEventListener = (
showUpdateDialog: (updateInfo: AppUpdateInfo) => void,
) => {

2
desktop/src/preload.ts
View file

@ -55,7 +55,6 @@ import {
muteUpdateNotification,
registerForegroundEventListener,
registerUpdateEventListener,
reloadWindow,
skipAppUpdate,
updateAndRestart,
} from "./api/system";
@ -327,7 +326,6 @@ contextBridge.exposeInMainWorld("ElectronAPIs", {
saveFileToDisk,
selectDirectory,
clearElectronStore,
reloadWindow,
readTextFile,
showUploadFilesDialog,
showUploadDirsDialog,

10
desktop/src/utils/createWindow.ts
View file

@ -52,16 +52,6 @@ export const createWindow = async () => {
);
mainWindow.loadURL(rendererURL);
}
mainWindow.webContents.on("did-fail-load", () => {
splash.close();
isDev
? mainWindow.loadFile(`../resources/error.html`)
: splash.loadURL(
`file://${path.join(process.resourcesPath, "error.html")}`,
);
mainWindow.maximize();
mainWindow.show();
});
mainWindow.once("ready-to-show", async () => {
try {
splash.destroy();

7
desktop/src/utils/ipcComms.ts
View file

@ -26,7 +26,6 @@ import {
generateImageThumbnail,
} from "../services/imageProcessor";
import { logErrorSentry } from "../services/sentry";
import { createWindow } from "./createWindow";
import { generateTempFilePath } from "./temp";
export default function setupIpcComs(
@ -43,12 +42,6 @@ export default function setupIpcComs(
}
});
ipcMain.on("reload-window", async () => {
const secondWindow = await createWindow();
mainWindow.destroy();
mainWindow = secondWindow;
});
ipcMain.handle("show-upload-files-dialog", async () => {
const files = await dialog.showOpenDialog({
properties: ["openFile", "multiSelections"],