Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove LoadingWindow #734

Merged
merged 1 commit into from
Sep 21, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/server_manager/electron_app/build_action.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ mkdir -p $STATIC_DIR
mkdir -p $STATIC_DIR/server_manager
cp -r $OUT_DIR/js/* $STATIC_DIR
cp -r $BUILD_DIR/server_manager/web_app/static $STATIC_DIR/server_manager/web_app/
# Our electron app assumes all HTML files will be in the web_app directory.
cp $MODULE_DIR/loading.html $STATIC_DIR/server_manager/web_app/

# Electron requires a package.json file for the app's name, etc.
# We also need to install NPMs at this location for require()
Expand Down
6 changes: 0 additions & 6 deletions src/server_manager/electron_app/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import {autoUpdater} from 'electron-updater';
import * as path from 'path';
import {URL, URLSearchParams} from 'url';

import {LoadingWindow} from './loading_window';
import * as menu from './menu';

const app = electron.app;
Expand Down Expand Up @@ -79,9 +78,6 @@ function createMainWindow() {
const webAppUrl = getWebAppUrl();
win.loadURL(webAppUrl);

const loadingWindow = new LoadingWindow(win, 'outline://web_app/loading.html');
const LOADING_WINDOW_DELAY_MS = 3000;

const handleNavigation = (event: Event, url: string) => {
try {
const parsed: URL = new URL(url);
Expand All @@ -103,8 +99,6 @@ function createMainWindow() {
handleNavigation(event, url);
});
win.webContents.on('did-finish-load', () => {
loadingWindow.hide();

// Wait until now to check for updates now so that the UI won't miss the event.
if (!debugMode) {
autoUpdater.checkForUpdates();
Expand Down
37 changes: 0 additions & 37 deletions src/server_manager/electron_app/loading.html

This file was deleted.

55 changes: 0 additions & 55 deletions src/server_manager/electron_app/loading_window.ts

This file was deleted.