From 28aac451bf43b5afa81120eb3c858ba6611dcbd7 Mon Sep 17 00:00:00 2001 From: smartfridge <37928912+smartfrigde@users.noreply.github.com> Date: Sun, 26 Dec 2021 20:15:18 +0100 Subject: [PATCH] Fix links opening --- src/main.ts | 99 ++++++++++++++++++++++++++--------------------------- 1 file changed, 49 insertions(+), 50 deletions(-) diff --git a/src/main.ts b/src/main.ts index 036f0a7..1c242e9 100644 --- a/src/main.ts +++ b/src/main.ts @@ -1,52 +1,52 @@ // Modules to control application life and create native browser window import { app, BrowserWindow, ipcMain, shell, desktopCapturer } from "electron"; import * as path from "path"; -import 'v8-compile-cache'; -import * as storage from 'electron-json-storage'; -import {setup} from './utils'; -import './extensions/plugin'; -import './tray'; +import "v8-compile-cache"; +import * as storage from "electron-json-storage"; +import { setup } from "./utils"; +import "./extensions/plugin"; +import "./tray"; var isSetup = null; -var contentPath:string = "null"; -var frame:boolean; +var contentPath: string = "null"; +var frame: boolean; export var mainWindow: BrowserWindow; -storage.keys(function(error, keys) { - if (error) throw error; - - for (var key of keys) { - console.log('There is a key called: ' + key); - } - }); -storage.has('firstRun', function(error, hasKey) { +storage.keys(function (error, keys) { + if (error) throw error; + + for (var key of keys) { + console.log("There is a key called: " + key); + } +}); +storage.has("firstRun", function (error, hasKey) { if (error) throw error; if (!hasKey) { - console.log('First run of the ArmCord. Starting setup.'); + console.log("First run of the ArmCord. Starting setup."); isSetup = true; setup(); - contentPath = __dirname + '/content/setup.html' + contentPath = __dirname + "/content/setup.html"; } else { - console.log('ArmCord has been run before. Skipping setup.'); + console.log("ArmCord has been run before. Skipping setup."); isSetup = false; - contentPath = __dirname + '/content/index.html' + contentPath = __dirname + "/content/index.html"; } }); -storage.get('settings', function(error, data:any) { - if (error) throw error; - console.log(data); - frame = data.customTitlebar; - console.log(frame) - }); -function createWindow () { - mainWindow = new BrowserWindow({ +storage.get("settings", function (error, data: any) { + if (error) throw error; + console.log(data); + frame = data.customTitlebar; + console.log(frame); +}); +function createWindow() { + mainWindow = new BrowserWindow({ width: 300, height: 350, title: "ArmCord", frame: frame, webPreferences: { - preload: path.join(__dirname, 'preload/preload.js') - } - }) + preload: path.join(__dirname, "preload/preload.js"), + }, + }); ipcMain.on("get-app-path", (event, arg) => { event.reply("app-path", app.getAppPath()); }); @@ -73,34 +73,33 @@ function createWindow () { }); ipcMain.on("get-app-version", (event) => { event.returnValue = process.env.npm_package_version; - }) + }); ipcMain.on("splashEnd", (event, arg) => { mainWindow.setSize(800, 600); }); ipcMain.on("channel", (event) => { - event.returnValue = storage.getSync('channel'); - }) - ipcMain.on("armcord-support", (event) => { - mainWindow.loadURL("https://discord.gg/F25bc4RYDt"); - }) - ipcMain.handle( - 'DESKTOP_CAPTURER_GET_SOURCES', - (event, opts) => desktopCapturer.getSources(opts) - ) + event.returnValue = storage.getSync("channel"); + }); + ipcMain.handle("DESKTOP_CAPTURER_GET_SOURCES", (event, opts) => + desktopCapturer.getSources(opts) + ); mainWindow.webContents.userAgent = "Mozilla/5.0 (X11; Linux x86) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.169 Safari/537.36"; //fake useragent - mainWindow.loadFile(contentPath) + mainWindow.webContents.on("new-window", function (e, url) { + e.preventDefault(); + shell.openExternal(url); + }); + mainWindow.loadFile(contentPath); } - app.whenReady().then(() => { - createWindow() + createWindow(); - app.on('activate', function () { - if (BrowserWindow.getAllWindows().length === 0) createWindow() - }) -}) + app.on("activate", function () { + if (BrowserWindow.getAllWindows().length === 0) createWindow(); + }); +}); -app.on('window-all-closed', function () { - if (process.platform !== 'darwin') app.quit() -}) +app.on("window-all-closed", function () { + if (process.platform !== "darwin") app.quit(); +});