okseby/orchard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'upcoming' of https://github.com/CiderApp/Cider into upcoming

Browse source
This commit is contained in:
Core 2022-01-18 15:29:00 +00:00
commit a51dc79a94
No known key found for this signature in database
GPG key ID: 1B77805746C47C28
23 changed files with 1835 additions and 1078 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/main/index.ts
View file

@ -11,7 +11,7 @@ import {AppEvents} from "./base/app";
import PluginHandler from "./base/plugins";
// const test = new PluginHandler();
let win = null;
let win: Promise<void> | null = null;
const config = new ConfigStore();
const App = new AppEvents(config.store);
const Cider = new Win(electron.app, config.store)
@ -30,8 +30,12 @@ electron.app.on('ready', () => {
require('vue-devtools').install()
}
win = Cider.createWindow();
plug.callPlugins('onReady', win);
electron.components.whenReady().then(() => {
win = Cider.createWindow();
plug.callPlugins('onReady', win);
})
});
/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@ -52,23 +56,27 @@ electron.app.on('before-quit', () => {
console.warn(`${electron.app.getName()} exited.`);
});
//
// // @ts-ignore
// // Widevine Stuff
// app.on('widevine-ready', (version, lastVersion) => {
// electron.app.on('widevine-ready', (version, lastVersion) => {
// if (null !== lastVersion) {
// console.log('[Cider][Widevine] Widevine ' + version + ', upgraded from ' + lastVersion + ', is ready to be used!')
// } else {
// console.log('[Cider][Widevine] Widevine ' + version + ' is ready to be used!')
// }
// })
//
// app.on('widevine-update-pending', (currentVersion, pendingVersion) => {
// // @ts-ignore
// electron.app.on('widevine-update-pending', (currentVersion, pendingVersion) => {
// console.log('[Cider][Widevine] Widevine ' + currentVersion + ' is ready to be upgraded to ' + pendingVersion + '!')
// })
//
// app.on('widevine-error', (error) => {
// // @ts-ignore
// electron.app.on('widevine-error', (error) => {
// console.log('[Cider][Widevine] Widevine installation encountered an error: ' + error)
// app.exit()
// electron.app.exit()
// })
//
//
// app.on('open-url', (event, url) => {