From c82d2e3bb263f82fac6f217f124ff359d98ba302 Mon Sep 17 00:00:00 2001 From: "prettifier[bot]" <45367598+prettifier[bot]@users.noreply.github.com> Date: Sun, 14 Nov 2021 04:23:29 +0000 Subject: [PATCH] Format 87d48a6 --- electron/main.js | 1199 +++++++++++++++------------- resources/css/screenselector.css | 7 +- resources/js/rambox-service-api.js | 94 ++- resources/js/screenselector.js | 86 +- screenselector.html | 36 +- 5 files changed, 794 insertions(+), 628 deletions(-) diff --git a/electron/main.js b/electron/main.js index fb68150f..7f2df767 100644 --- a/electron/main.js +++ b/electron/main.js @@ -1,87 +1,101 @@ -'use strict'; - -const {app, BrowserWindow, shell, Menu, ipcMain, nativeImage, session} = require('electron'); +"use strict"; + +const { + app, + BrowserWindow, + shell, + Menu, + ipcMain, + nativeImage, + session, +} = require("electron"); // Tray -const tray = require('./tray'); +const tray = require("./tray"); // AutoLaunch -var AutoLaunch = require('auto-launch-patched'); +var AutoLaunch = require("auto-launch-patched"); // Configuration -const Config = require('electron-store'); +const Config = require("electron-store"); // Development -const isDev = require('electron-is-dev'); +const isDev = require("electron-is-dev"); // Updater -const updater = require('./updater'); +const updater = require("./updater"); // File System var fs = require("fs"); -const path = require('path'); +const path = require("path"); // Disk usage: // const disk = require('diskusage'); -if ( isDev ) app.getVersion = function() { return require('../package.json').version; }; // FOR DEV ONLY, BECAUSE IN DEV RETURNS ELECTRON'S VERSION +if (isDev) + app.getVersion = function () { + return require("../package.json").version; + }; // FOR DEV ONLY, BECAUSE IN DEV RETURNS ELECTRON'S VERSION // Initial Config const config = new Config({ - defaults: { - always_on_top: false - ,hide_menu_bar: false - ,tabbar_location: 'top' - ,hide_tabbar_labels: false - ,window_display_behavior: 'taskbar_tray' - ,auto_launch: !isDev - ,flash_frame: true - ,window_close_behavior: 'keep_in_tray' - ,start_minimized: false - ,systemtray_indicator: true - ,master_password: false - ,dont_disturb: false - ,disable_gpu: process.platform === 'linux' - ,proxy: false - ,proxyHost: '' - ,proxyPort: '' - ,proxyLogin: '' - ,proxyPassword: '' - ,locale: 'en' - ,enable_hidpi_support: false - ,user_agent: '' - ,default_service: 'ramboxTab' - ,sendStatistics: false - - ,x: undefined - ,y: undefined - ,width: 1000 - ,height: 800 - ,maximized: false - } + defaults: { + always_on_top: false, + hide_menu_bar: false, + tabbar_location: "top", + hide_tabbar_labels: false, + window_display_behavior: "taskbar_tray", + auto_launch: !isDev, + flash_frame: true, + window_close_behavior: "keep_in_tray", + start_minimized: false, + systemtray_indicator: true, + master_password: false, + dont_disturb: false, + disable_gpu: process.platform === "linux", + proxy: false, + proxyHost: "", + proxyPort: "", + proxyLogin: "", + proxyPassword: "", + locale: "en", + enable_hidpi_support: false, + user_agent: "", + default_service: "ramboxTab", + sendStatistics: false, + + x: undefined, + y: undefined, + width: 1000, + height: 800, + maximized: false, + }, }); // Fix issues with HiDPI scaling on Windows platform -if (config.get('enable_hidpi_support') && (process.platform === 'win32')) { - app.commandLine.appendSwitch('high-dpi-support', 'true') - app.commandLine.appendSwitch('force-device-scale-factor', '1') +if (config.get("enable_hidpi_support") && process.platform === "win32") { + app.commandLine.appendSwitch("high-dpi-support", "true"); + app.commandLine.appendSwitch("force-device-scale-factor", "1"); } -app.commandLine.appendSwitch('lang', config.get('locale') === 'en' ? 'en-US' : config.get('locale')); +app.commandLine.appendSwitch( + "lang", + config.get("locale") === "en" ? "en-US" : config.get("locale") +); // Temporary fix to load Twitter and other websites inside webviews // Bug related with Electron: https://github.com/electron/electron/issues/25469 -app.commandLine.appendSwitch('disable-features', 'CrossOriginOpenerPolicy'); +app.commandLine.appendSwitch("disable-features", "CrossOriginOpenerPolicy"); // Because we build it using Squirrel, it will assign UserModelId automatically, so we match it here to display notifications correctly. // https://github.com/electron-userland/electron-builder/issues/362 -app.setAppUserModelId('com.grupovrs.ramboxce'); +app.setAppUserModelId("com.grupovrs.ramboxce"); // Menu -const appMenu = require('./menu')(config); +const appMenu = require("./menu")(config); // Configure AutoLaunch let appLauncher; -if ( !isDev ) { - appLauncher = new AutoLaunch({ - name: 'Rambox' - ,isHidden: config.get('start_minimized') - }); - config.get('auto_launch') ? appLauncher.enable() : appLauncher.disable(); +if (!isDev) { + appLauncher = new AutoLaunch({ + name: "Rambox", + isHidden: config.get("start_minimized"), + }); + config.get("auto_launch") ? appLauncher.enable() : appLauncher.disable(); } // Keep a global reference of the window object, if you don't, the window will @@ -89,188 +103,236 @@ if ( !isDev ) { let mainWindow; let isQuitting = false; -function createWindow () { - // Create the browser window using the state information - mainWindow = new BrowserWindow({ - title: 'Rambox' - ,icon: __dirname + '/../resources/Icon.' + (process.platform === 'linux' ? 'png' : 'ico') - ,backgroundColor: '#FFF' - ,x: config.get('x') - ,y: config.get('y') - ,width: config.get('width') - ,height: config.get('height') - ,alwaysOnTop: config.get('always_on_top') - ,autoHideMenuBar: config.get('hide_menu_bar') - ,skipTaskbar: config.get('window_display_behavior') === 'show_trayIcon' - ,show: !config.get('start_minimized') - ,acceptFirstMouse: true - ,webPreferences: { - enableRemoteModule: true - ,plugins: true - ,partition: 'persist:rambox' - ,nodeIntegration: true - ,webviewTag: true - ,contextIsolation: false - ,spellcheck: false - } - }); - - // Check if user has defined a custom User-Agent - if ( config.get('user_agent').length > 0 ) mainWindow.webContents.setUserAgent( config.get('user_agent') ); - - // Wait for the mainWindow.loadURL(..) and the optional mainWindow.webContents.openDevTools() - // to be finished before minimizing - config.get('start_minimized') && mainWindow.webContents.once('did-finish-load', () => config.get('window_display_behavior') === 'show_trayIcon' ? mainWindow.hide() : mainWindow.minimize()); - - // Check if the window its outside of the view (ex: multi monitor setup) - const { positionOnScreen } = require('./utils/positionOnScreen'); - const inBounds = positionOnScreen([config.get('x'), config.get('y')]); - if ( inBounds ) { - mainWindow.setPosition(config.get('x'), config.get('y')); - } else { - mainWindow.center(); - } - - process.setMaxListeners(10000); - - // Open the DevTools. - if ( isDev ) mainWindow.webContents.openDevTools(); - - // and load the index.html of the app. - mainWindow.loadURL('file://' + __dirname + '/../index.html'); - - Menu.setApplicationMenu(appMenu); - - tray.create(mainWindow, config); - - if ( process.argv.indexOf('--without-update') === -1 ) updater.initialize(mainWindow); - - // Open links in default browser - mainWindow.webContents.on('new-window', function(e, url, frameName, disposition, options) { - const protocol = require('url').parse(url).protocol; - switch ( disposition ) { - case 'new-window': - e.preventDefault(); - const win = new BrowserWindow(options); - if ( config.get('user_agent').length > 0 ) win.webContents.setUserAgent( config.get('user_agent') ); - win.once('ready-to-show', () => win.show()); - win.loadURL(url); - e.newGuest = win; - break; - case 'foreground-tab': - if (protocol === 'http:' || protocol === 'https:' || protocol === 'mailto:') { - e.preventDefault(); - shell.openExternal(url); - } - break; - default: - break; - } - }); - - mainWindow.webContents.on('will-navigate', function(event, url) { - event.preventDefault(); - }); - - // BrowserWindow events - mainWindow.on('page-title-updated', (e, title) => updateBadge(title)); - mainWindow.on('maximize', function(e) { config.set('maximized', true); }); - mainWindow.on('unmaximize', function(e) { config.set('maximized', false); }); - mainWindow.on('resize', function(e) { if (!mainWindow.isMaximized()) config.set(mainWindow.getBounds()); }); - mainWindow.on('move', function(e) { if (!mainWindow.isMaximized()) config.set(mainWindow.getBounds()); }); - mainWindow.on('app-command', (e, cmd) => { - // Navigate the window back when the user hits their mouse back button - if ( cmd === 'browser-backward' ) mainWindow.webContents.executeJavaScript('if(Ext.cq1("app-main")) Ext.cq1("app-main").getActiveTab().goBack();'); - // Navigate the window forward when the user hits their mouse forward button - if ( cmd === 'browser-forward' ) mainWindow.webContents.executeJavaScript('if(Ext.cq1("app-main")) Ext.cq1("app-main").getActiveTab().goForward();'); - }); - - // Emitted when the window is closed. - mainWindow.on('close', function(e) { - if ( !isQuitting ) { - e.preventDefault(); - - switch (process.platform) { - case 'darwin': - app.hide(); - break; - case 'linux': - case 'win32': - default: - switch (config.get('window_close_behavior')) { - case 'keep_in_tray': - mainWindow.hide(); - break; - case 'keep_in_tray_and_taskbar': - mainWindow.minimize(); - break; - case 'quit': - app.quit(); - break; - } - break; - } - } - }); - mainWindow.on('minimize', function(e) { - if ( config.get('window_display_behavior') === 'show_trayIcon' ) mainWindow.setSkipTaskbar(true); - }); - mainWindow.on('restore', function(e) { - if ( config.get('window_display_behavior') === 'show_taskbar' ) mainWindow.setSkipTaskbar(false); - }); - mainWindow.on('show', function(e) { - if ( config.get('window_display_behavior') !== 'show_trayIcon' ) mainWindow.setSkipTaskbar(false); - }); - mainWindow.on('closed', function(e) { - mainWindow = null; - }); - mainWindow.once('focus', () => mainWindow.flashFrame(false)); +function createWindow() { + // Create the browser window using the state information + mainWindow = new BrowserWindow({ + title: "Rambox", + icon: + __dirname + + "/../resources/Icon." + + (process.platform === "linux" ? "png" : "ico"), + backgroundColor: "#FFF", + x: config.get("x"), + y: config.get("y"), + width: config.get("width"), + height: config.get("height"), + alwaysOnTop: config.get("always_on_top"), + autoHideMenuBar: config.get("hide_menu_bar"), + skipTaskbar: config.get("window_display_behavior") === "show_trayIcon", + show: !config.get("start_minimized"), + acceptFirstMouse: true, + webPreferences: { + enableRemoteModule: true, + plugins: true, + partition: "persist:rambox", + nodeIntegration: true, + webviewTag: true, + contextIsolation: false, + spellcheck: false, + }, + }); + + // Check if user has defined a custom User-Agent + if (config.get("user_agent").length > 0) + mainWindow.webContents.setUserAgent(config.get("user_agent")); + + // Wait for the mainWindow.loadURL(..) and the optional mainWindow.webContents.openDevTools() + // to be finished before minimizing + config.get("start_minimized") && + mainWindow.webContents.once("did-finish-load", () => + config.get("window_display_behavior") === "show_trayIcon" + ? mainWindow.hide() + : mainWindow.minimize() + ); + + // Check if the window its outside of the view (ex: multi monitor setup) + const { positionOnScreen } = require("./utils/positionOnScreen"); + const inBounds = positionOnScreen([config.get("x"), config.get("y")]); + if (inBounds) { + mainWindow.setPosition(config.get("x"), config.get("y")); + } else { + mainWindow.center(); + } + + process.setMaxListeners(10000); + + // Open the DevTools. + if (isDev) mainWindow.webContents.openDevTools(); + + // and load the index.html of the app. + mainWindow.loadURL("file://" + __dirname + "/../index.html"); + + Menu.setApplicationMenu(appMenu); + + tray.create(mainWindow, config); + + if (process.argv.indexOf("--without-update") === -1) + updater.initialize(mainWindow); + + // Open links in default browser + mainWindow.webContents.on( + "new-window", + function (e, url, frameName, disposition, options) { + const protocol = require("url").parse(url).protocol; + switch (disposition) { + case "new-window": + e.preventDefault(); + const win = new BrowserWindow(options); + if (config.get("user_agent").length > 0) + win.webContents.setUserAgent(config.get("user_agent")); + win.once("ready-to-show", () => win.show()); + win.loadURL(url); + e.newGuest = win; + break; + case "foreground-tab": + if ( + protocol === "http:" || + protocol === "https:" || + protocol === "mailto:" + ) { + e.preventDefault(); + shell.openExternal(url); + } + break; + default: + break; + } + } + ); + + mainWindow.webContents.on("will-navigate", function (event, url) { + event.preventDefault(); + }); + + // BrowserWindow events + mainWindow.on("page-title-updated", (e, title) => updateBadge(title)); + mainWindow.on("maximize", function (e) { + config.set("maximized", true); + }); + mainWindow.on("unmaximize", function (e) { + config.set("maximized", false); + }); + mainWindow.on("resize", function (e) { + if (!mainWindow.isMaximized()) config.set(mainWindow.getBounds()); + }); + mainWindow.on("move", function (e) { + if (!mainWindow.isMaximized()) config.set(mainWindow.getBounds()); + }); + mainWindow.on("app-command", (e, cmd) => { + // Navigate the window back when the user hits their mouse back button + if (cmd === "browser-backward") + mainWindow.webContents.executeJavaScript( + 'if(Ext.cq1("app-main")) Ext.cq1("app-main").getActiveTab().goBack();' + ); + // Navigate the window forward when the user hits their mouse forward button + if (cmd === "browser-forward") + mainWindow.webContents.executeJavaScript( + 'if(Ext.cq1("app-main")) Ext.cq1("app-main").getActiveTab().goForward();' + ); + }); + + // Emitted when the window is closed. + mainWindow.on("close", function (e) { + if (!isQuitting) { + e.preventDefault(); + + switch (process.platform) { + case "darwin": + app.hide(); + break; + case "linux": + case "win32": + default: + switch (config.get("window_close_behavior")) { + case "keep_in_tray": + mainWindow.hide(); + break; + case "keep_in_tray_and_taskbar": + mainWindow.minimize(); + break; + case "quit": + app.quit(); + break; + } + break; + } + } + }); + mainWindow.on("minimize", function (e) { + if (config.get("window_display_behavior") === "show_trayIcon") + mainWindow.setSkipTaskbar(true); + }); + mainWindow.on("restore", function (e) { + if (config.get("window_display_behavior") === "show_taskbar") + mainWindow.setSkipTaskbar(false); + }); + mainWindow.on("show", function (e) { + if (config.get("window_display_behavior") !== "show_trayIcon") + mainWindow.setSkipTaskbar(false); + }); + mainWindow.on("closed", function (e) { + mainWindow = null; + }); + mainWindow.once("focus", () => mainWindow.flashFrame(false)); } let mainMasterPasswordWindow; function createMasterPasswordWindow() { - mainMasterPasswordWindow = new BrowserWindow({ - backgroundColor: '#0675A0' - ,frame: false - ,webPreferences: { - nodeIntegration: true - ,enableRemoteModule: true - } - }); - // Open the DevTools. - if ( isDev ) mainMasterPasswordWindow.webContents.openDevTools(); - - mainMasterPasswordWindow.loadURL('file://' + __dirname + '/../masterpassword.html'); - mainMasterPasswordWindow.on('close', function() { mainMasterPasswordWindow = null }); + mainMasterPasswordWindow = new BrowserWindow({ + backgroundColor: "#0675A0", + frame: false, + webPreferences: { + nodeIntegration: true, + enableRemoteModule: true, + }, + }); + // Open the DevTools. + if (isDev) mainMasterPasswordWindow.webContents.openDevTools(); + + mainMasterPasswordWindow.loadURL( + "file://" + __dirname + "/../masterpassword.html" + ); + mainMasterPasswordWindow.on("close", function () { + mainMasterPasswordWindow = null; + }); } function updateBadge(title) { - title = title.split(" - ")[0]; //Discard service name if present, could also contain digits - var messageCount = title.match(/\d+/g) ? parseInt(title.match(/\d+/g).join("")) : 0; - messageCount = isNaN(messageCount) ? 0 : messageCount; - - tray.setBadge(messageCount, config.get('systemtray_indicator')); - - if (process.platform === 'win32') { - if (messageCount === 0) return mainWindow.setOverlayIcon(null, ''); - mainWindow.webContents.send('setBadge', messageCount); - } else { // macOS & Linux - app.setBadgeCount(messageCount); - } - - if ( messageCount > 0 && !mainWindow.isFocused() && !config.get('dont_disturb') && config.get('flash_frame') ) mainWindow.flashFrame(true); + title = title.split(" - ")[0]; //Discard service name if present, could also contain digits + var messageCount = title.match(/\d+/g) + ? parseInt(title.match(/\d+/g).join("")) + : 0; + messageCount = isNaN(messageCount) ? 0 : messageCount; + + tray.setBadge(messageCount, config.get("systemtray_indicator")); + + if (process.platform === "win32") { + if (messageCount === 0) return mainWindow.setOverlayIcon(null, ""); + mainWindow.webContents.send("setBadge", messageCount); + } else { + // macOS & Linux + app.setBadgeCount(messageCount); + } + + if ( + messageCount > 0 && + !mainWindow.isFocused() && + !config.get("dont_disturb") && + config.get("flash_frame") + ) + mainWindow.flashFrame(true); } function formatBytes(bytes, decimals = 2) { - if (bytes === 0) return '0 Bytes'; + if (bytes === 0) return "0 Bytes"; - const k = 1024; - const dm = decimals < 0 ? 0 : decimals; - const sizes = ['Bytes', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB']; + const k = 1024; + const dm = decimals < 0 ? 0 : decimals; + const sizes = ["Bytes", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"]; - const i = Math.floor(Math.log(bytes) / Math.log(k)); + const i = Math.floor(Math.log(bytes) / Math.log(k)); - return parseFloat((bytes / Math.pow(k, i)).toFixed(dm)) + ' ' + sizes[i]; + return parseFloat((bytes / Math.pow(k, i)).toFixed(dm)) + " " + sizes[i]; } /* async function availableSpaceWatchDog() { @@ -295,377 +357,448 @@ function formatBytes(bytes, decimals = 2) { } } */ -ipcMain.on('setBadge', function(event, messageCount, value) { - mainWindow.setOverlayIcon(nativeImage.createFromDataURL(value), messageCount.toString()); +ipcMain.on("setBadge", function (event, messageCount, value) { + mainWindow.setOverlayIcon( + nativeImage.createFromDataURL(value), + messageCount.toString() + ); }); -ipcMain.on('getConfig', function(event, arg) { - event.returnValue = config.store; +ipcMain.on("getConfig", function (event, arg) { + event.returnValue = config.store; }); -ipcMain.on('sConfig', function(event, values) { - config.set(values); - event.returnValue = config; +ipcMain.on("sConfig", function (event, values) { + config.set(values); + event.returnValue = config; }); -ipcMain.on('setConfig', function(event, values) { - config.set(values); - - // hide_menu_bar - mainWindow.setAutoHideMenuBar(values.hide_menu_bar); - if ( !values.hide_menu_bar ) mainWindow.setMenuBarVisibility(true); - // always_on_top - mainWindow.setAlwaysOnTop(values.always_on_top); - // auto_launch - if ( !isDev ) values.auto_launch ? appLauncher.enable() : appLauncher.disable(); - // systemtray_indicator - updateBadge(mainWindow.getTitle()); - - mainWindow.webContents.executeJavaScript('(function(a){if(a)a.controller.initialize(a)})(Ext.cq1("app-main"))'); - - switch ( values.window_display_behavior ) { - case 'show_taskbar': - mainWindow.setSkipTaskbar(false); - tray.destroy(); - break; - case 'show_trayIcon': - mainWindow.setSkipTaskbar(true); - tray.create(mainWindow, config); - break; - case 'taskbar_tray': - mainWindow.setSkipTaskbar(false); - tray.create(mainWindow, config); - break; - default: - break; - } +ipcMain.on("setConfig", function (event, values) { + config.set(values); + + // hide_menu_bar + mainWindow.setAutoHideMenuBar(values.hide_menu_bar); + if (!values.hide_menu_bar) mainWindow.setMenuBarVisibility(true); + // always_on_top + mainWindow.setAlwaysOnTop(values.always_on_top); + // auto_launch + if (!isDev) values.auto_launch ? appLauncher.enable() : appLauncher.disable(); + // systemtray_indicator + updateBadge(mainWindow.getTitle()); + + mainWindow.webContents.executeJavaScript( + '(function(a){if(a)a.controller.initialize(a)})(Ext.cq1("app-main"))' + ); + + switch (values.window_display_behavior) { + case "show_taskbar": + mainWindow.setSkipTaskbar(false); + tray.destroy(); + break; + case "show_trayIcon": + mainWindow.setSkipTaskbar(true); + tray.create(mainWindow, config); + break; + case "taskbar_tray": + mainWindow.setSkipTaskbar(false); + tray.create(mainWindow, config); + break; + default: + break; + } }); -ipcMain.on('sendStatistics', function(event) { - event.returnValue = config.get('sendStatistics'); +ipcMain.on("sendStatistics", function (event) { + event.returnValue = config.get("sendStatistics"); }); -ipcMain.on('validateMasterPassword', function(event, pass) { - if ( config.get('master_password') === require('crypto').createHash('md5').update(pass).digest('hex') ) { - createWindow(); - mainMasterPasswordWindow.close(); - event.returnValue = true; - } - event.returnValue = false; +ipcMain.on("validateMasterPassword", function (event, pass) { + if ( + config.get("master_password") === + require("crypto").createHash("md5").update(pass).digest("hex") + ) { + createWindow(); + mainMasterPasswordWindow.close(); + event.returnValue = true; + } + event.returnValue = false; }); // Handle Service Notifications -ipcMain.on('setServiceNotifications', function(event, partition, op) { - if ( partition === null ) return; - session.fromPartition(partition).setPermissionRequestHandler(function(webContents, permission, callback) { - if (permission === 'notifications') return callback(op); - callback(true) - }); +ipcMain.on("setServiceNotifications", function (event, partition, op) { + if (partition === null) return; + session + .fromPartition(partition) + .setPermissionRequestHandler(function (webContents, permission, callback) { + if (permission === "notifications") return callback(op); + callback(true); + }); }); -ipcMain.on('setDontDisturb', function(event, arg) { - config.set('dont_disturb', arg); +ipcMain.on("setDontDisturb", function (event, arg) { + config.set("dont_disturb", arg); }); // Reload app -ipcMain.on('reloadApp', function(event) { - mainWindow.reload(); +ipcMain.on("reloadApp", function (event) { + mainWindow.reload(); }); // Relaunch app -ipcMain.on('relaunchApp', function(event) { - app.relaunch(); - app.exit(0); +ipcMain.on("relaunchApp", function (event) { + app.relaunch(); + app.exit(0); }); const shouldQuit = app.requestSingleInstanceLock(); if (!shouldQuit) { - app.quit(); - return; + app.quit(); + return; } -app.on('second-instance', (event, commandLine, workingDirectory) => { - // Someone tried to run a second instance, we should focus our window. - if (mainWindow) { - if (mainWindow.isMinimized()) mainWindow.restore(); - mainWindow.focus(); - mainWindow.show(); - mainWindow.setSkipTaskbar(false); - if (app.dock && app.dock.show) app.dock.show(); - } +app.on("second-instance", (event, commandLine, workingDirectory) => { + // Someone tried to run a second instance, we should focus our window. + if (mainWindow) { + if (mainWindow.isMinimized()) mainWindow.restore(); + mainWindow.focus(); + mainWindow.show(); + mainWindow.setSkipTaskbar(false); + if (app.dock && app.dock.show) app.dock.show(); + } }); // ALLOWED URLS POPUPS let allowPopUp = [ - 'feedly.com/v3/auth/', - 'identity.linuxfoundation.org/cas/login', - 'auth.missiveapp.com', - 'accounts.google.com/AccountChooser', - 'facebook.com/v3.1/dialog/oauth?', - 'accounts.google.com/o/oauth2', - 'app.slack.com/files/import/gdrive', - 'spikenow.com/s/account', - 'app.mixmax.com/_oauth/google', - 'officeapps.live.com', - 'dropbox.com/profile_services/start_auth_flow', - 'facebook.com/v3.2/dialog/oauth?', - 'notion.so/googlepopupredirect', - 'zoom.us/office365', - 'figma.com/start_google_sso', - 'mail.google.com/mail', - 'app.slack.com/free-willy/', - 'messenger.com/videocall', - 'api.moo.do', - 'manychat.com/fb?popup', - '=?print=true' // esta ultima checkea como anda imprimir un pedf desde gmail, si no va bie sacala + "feedly.com/v3/auth/", + "identity.linuxfoundation.org/cas/login", + "auth.missiveapp.com", + "accounts.google.com/AccountChooser", + "facebook.com/v3.1/dialog/oauth?", + "accounts.google.com/o/oauth2", + "app.slack.com/files/import/gdrive", + "spikenow.com/s/account", + "app.mixmax.com/_oauth/google", + "officeapps.live.com", + "dropbox.com/profile_services/start_auth_flow", + "facebook.com/v3.2/dialog/oauth?", + "notion.so/googlepopupredirect", + "zoom.us/office365", + "figma.com/start_google_sso", + "mail.google.com/mail", + "app.slack.com/free-willy/", + "messenger.com/videocall", + "api.moo.do", + "manychat.com/fb?popup", + "=?print=true", // esta ultima checkea como anda imprimir un pedf desde gmail, si no va bie sacala ]; -app.on('web-contents-created', (webContentsCreatedEvent, contents) => { - if (contents.getType() !== 'webview') return; - // Block some Deep links to prevent that open its app (Ex: Slack) - contents.on('will-navigate', (event, url) => url.substring(0, 8) === 'slack://' && event.preventDefault()); - // New Window handler - contents.on('new-window', (event, url, frameName, disposition, options, additionalFeatures, referrer, postBody) => { - // If the url is about:blank we allow the window and handle it in 'did-create-window' - if (['about:blank', 'about:blank#blocked'].includes(url)) { - event.preventDefault(); - Object.assign(options, { show: false }); - const win = new BrowserWindow(options); - win.center(); - let once = false; - win.webContents.on('will-navigate', (e, nextURL) => { - if (once) return; - if (['about:blank', 'about:blank#blocked'].includes(nextURL)) return; - once = true; - let allow = false; - allowPopUp.forEach(url => nextURL.indexOf(url) > -1 && (allow = true)); - // If the url is in aboutBlankOnlyWindow we handle this as a popup window - if (allow) return win.show(); - shell.openExternal(nextURL); - win.close() - }) - event.newGuest = win; - return; - } - // We check if url is in the allowPopUpLoginURLs or allowForegroundTabURLs in Firebase to open a as a popup, - // if it is not we send this to the app - let allow = false; - allowPopUp.forEach(allowed => url.indexOf(allowed) > -1 && (allow = true)); - if (allow) return; - shell.openExternal(url); - event.preventDefault(); - }); - contents.on('did-create-window', (win, details) => { - // Here we center the new window. - win.center(); - // The following code is for handling the about:blank cases only. - if (!['about:blank', 'about:blank#blocked'].includes(details.url)) return; - let once = false; - win.webContents.on('will-navigate', (e, nextURL) => { - if (once) return; - if (['about:blank', 'about:blank#blocked'].includes(nextURL)) return; - once = true; - let allow = false; - allowPopUp.forEach(url => nextURL.indexOf(url) > -1 && (allow = true)); - // If the url is in aboutBlankOnlyWindow we handle this as a popup window - if (allow) return win.show(); - shell.openExternal(url); - win.close(); - }); - }); +app.on("web-contents-created", (webContentsCreatedEvent, contents) => { + if (contents.getType() !== "webview") return; + // Block some Deep links to prevent that open its app (Ex: Slack) + contents.on( + "will-navigate", + (event, url) => url.substring(0, 8) === "slack://" && event.preventDefault() + ); + // New Window handler + contents.on( + "new-window", + ( + event, + url, + frameName, + disposition, + options, + additionalFeatures, + referrer, + postBody + ) => { + // If the url is about:blank we allow the window and handle it in 'did-create-window' + if (["about:blank", "about:blank#blocked"].includes(url)) { + event.preventDefault(); + Object.assign(options, { show: false }); + const win = new BrowserWindow(options); + win.center(); + let once = false; + win.webContents.on("will-navigate", (e, nextURL) => { + if (once) return; + if (["about:blank", "about:blank#blocked"].includes(nextURL)) return; + once = true; + let allow = false; + allowPopUp.forEach( + (url) => nextURL.indexOf(url) > -1 && (allow = true) + ); + // If the url is in aboutBlankOnlyWindow we handle this as a popup window + if (allow) return win.show(); + shell.openExternal(nextURL); + win.close(); + }); + event.newGuest = win; + return; + } + // We check if url is in the allowPopUpLoginURLs or allowForegroundTabURLs in Firebase to open a as a popup, + // if it is not we send this to the app + let allow = false; + allowPopUp.forEach( + (allowed) => url.indexOf(allowed) > -1 && (allow = true) + ); + if (allow) return; + shell.openExternal(url); + event.preventDefault(); + } + ); + contents.on("did-create-window", (win, details) => { + // Here we center the new window. + win.center(); + // The following code is for handling the about:blank cases only. + if (!["about:blank", "about:blank#blocked"].includes(details.url)) return; + let once = false; + win.webContents.on("will-navigate", (e, nextURL) => { + if (once) return; + if (["about:blank", "about:blank#blocked"].includes(nextURL)) return; + once = true; + let allow = false; + allowPopUp.forEach((url) => nextURL.indexOf(url) > -1 && (allow = true)); + // If the url is in aboutBlankOnlyWindow we handle this as a popup window + if (allow) return win.show(); + shell.openExternal(url); + win.close(); + }); + }); }); // Code for downloading images as temporal files // Credit: Ghetto Skype (https://github.com/stanfieldr/ghetto-skype) -const tmp = require('tmp'); -const mime = require('mime'); +const tmp = require("tmp"); +const mime = require("mime"); var imageCache = {}; -ipcMain.on('image:download', function(event, url, partition) { - let file = imageCache[url]; - if (file) { - if (file.complete) { - shell.openItem(file.path); - } - - // Pending downloads intentionally do not proceed - return; - } - - let tmpWindow = new BrowserWindow({ - show: false - ,webPreferences: { - partition: partition - } - }); - - if ( config.get('user_agent').length > 0 ) tmpWindow.webContents.setUserAgent( config.get('user_agent') ); - - tmpWindow.webContents.session.once('will-download', (event, downloadItem) => { - imageCache[url] = file = { - path: tmp.tmpNameSync() + '.' + mime.extension(downloadItem.getMimeType()) - ,complete: false - }; - - downloadItem.setSavePath(file.path); - downloadItem.once('done', () => { - tmpWindow.destroy(); - tmpWindow = null; - shell.openItem(file.path); - file.complete = true; - }); - }); - - tmpWindow.webContents.downloadURL(url); +ipcMain.on("image:download", function (event, url, partition) { + let file = imageCache[url]; + if (file) { + if (file.complete) { + shell.openItem(file.path); + } + + // Pending downloads intentionally do not proceed + return; + } + + let tmpWindow = new BrowserWindow({ + show: false, + webPreferences: { + partition: partition, + }, + }); + + if (config.get("user_agent").length > 0) + tmpWindow.webContents.setUserAgent(config.get("user_agent")); + + tmpWindow.webContents.session.once("will-download", (event, downloadItem) => { + imageCache[url] = file = { + path: + tmp.tmpNameSync() + "." + mime.extension(downloadItem.getMimeType()), + complete: false, + }; + + downloadItem.setSavePath(file.path); + downloadItem.once("done", () => { + tmpWindow.destroy(); + tmpWindow = null; + shell.openItem(file.path); + file.complete = true; + }); + }); + + tmpWindow.webContents.downloadURL(url); }); // Hangouts -ipcMain.on('image:popup', function(event, url, partition) { - let tmpWindow = new BrowserWindow({ - width: mainWindow.getBounds().width - ,height: mainWindow.getBounds().height - ,parent: mainWindow - ,icon: __dirname + '/../resources/Icon.ico' - ,backgroundColor: '#FFF' - ,autoHideMenuBar: true - ,skipTaskbar: true - ,webPreferences: { - partition: partition - } - }); - - if ( config.get('user_agent').length > 0 ) tmpWindow.webContents.setUserAgent( config.get('user_agent') ); - - tmpWindow.maximize(); - - tmpWindow.loadURL(url); +ipcMain.on("image:popup", function (event, url, partition) { + let tmpWindow = new BrowserWindow({ + width: mainWindow.getBounds().width, + height: mainWindow.getBounds().height, + parent: mainWindow, + icon: __dirname + "/../resources/Icon.ico", + backgroundColor: "#FFF", + autoHideMenuBar: true, + skipTaskbar: true, + webPreferences: { + partition: partition, + }, + }); + + if (config.get("user_agent").length > 0) + tmpWindow.webContents.setUserAgent(config.get("user_agent")); + + tmpWindow.maximize(); + + tmpWindow.loadURL(url); }); -ipcMain.on('toggleWin', function(event, allwaysShow) { - if ( config.get('window_display_behavior') !== 'show_trayIcon' ) mainWindow.setSkipTaskbar(false); - if ( !mainWindow.isMinimized() && mainWindow.isMaximized() && mainWindow.isVisible() ) { // Maximized - !allwaysShow ? mainWindow.close() : mainWindow.show(); - } else if ( mainWindow.isMinimized() && !mainWindow.isMaximized() && !mainWindow.isVisible() ) { // Minimized - if ( process.platform === 'linux' ) { - mainWindow.minimize(); - mainWindow.restore(); - mainWindow.focus(); - return - } - mainWindow.restore(); - } else if ( !mainWindow.isMinimized() && !mainWindow.isMaximized() && mainWindow.isVisible() ) { // Windowed mode - !allwaysShow ? mainWindow.close() : mainWindow.show(); - } else if ( mainWindow.isMinimized() && !mainWindow.isMaximized() && mainWindow.isVisible() ) { // Closed to taskbar - if ( process.platform === 'linux' ) { - mainWindow.minimize(); - mainWindow.restore(); - mainWindow.focus(); - return - } - mainWindow.restore(); - } else if ( !mainWindow.isMinimized() && mainWindow.isMaximized() && !mainWindow.isVisible() ) { // Closed maximized to tray - mainWindow.show(); - } else if ( !mainWindow.isMinimized() && !mainWindow.isMaximized() && !mainWindow.isVisible() ) { // Closed windowed to tray - mainWindow.show(); - } else if ( mainWindow.isMinimized() && !mainWindow.isMaximized() && !mainWindow.isVisible() ) { // Closed minimized to tray - mainWindow.show(); - } else { - if ( process.platform === 'linux' ) { - mainWindow.minimize(); - mainWindow.maximize(); - mainWindow.focus(); - return - } - mainWindow.restore(); - } +ipcMain.on("toggleWin", function (event, allwaysShow) { + if (config.get("window_display_behavior") !== "show_trayIcon") + mainWindow.setSkipTaskbar(false); + if ( + !mainWindow.isMinimized() && + mainWindow.isMaximized() && + mainWindow.isVisible() + ) { + // Maximized + !allwaysShow ? mainWindow.close() : mainWindow.show(); + } else if ( + mainWindow.isMinimized() && + !mainWindow.isMaximized() && + !mainWindow.isVisible() + ) { + // Minimized + if (process.platform === "linux") { + mainWindow.minimize(); + mainWindow.restore(); + mainWindow.focus(); + return; + } + mainWindow.restore(); + } else if ( + !mainWindow.isMinimized() && + !mainWindow.isMaximized() && + mainWindow.isVisible() + ) { + // Windowed mode + !allwaysShow ? mainWindow.close() : mainWindow.show(); + } else if ( + mainWindow.isMinimized() && + !mainWindow.isMaximized() && + mainWindow.isVisible() + ) { + // Closed to taskbar + if (process.platform === "linux") { + mainWindow.minimize(); + mainWindow.restore(); + mainWindow.focus(); + return; + } + mainWindow.restore(); + } else if ( + !mainWindow.isMinimized() && + mainWindow.isMaximized() && + !mainWindow.isVisible() + ) { + // Closed maximized to tray + mainWindow.show(); + } else if ( + !mainWindow.isMinimized() && + !mainWindow.isMaximized() && + !mainWindow.isVisible() + ) { + // Closed windowed to tray + mainWindow.show(); + } else if ( + mainWindow.isMinimized() && + !mainWindow.isMaximized() && + !mainWindow.isVisible() + ) { + // Closed minimized to tray + mainWindow.show(); + } else { + if (process.platform === "linux") { + mainWindow.minimize(); + mainWindow.maximize(); + mainWindow.focus(); + return; + } + mainWindow.restore(); + } }); // ScreenShare -ipcMain.on('screenShare:show', (event, screenList) => { - let tmpWindow = new BrowserWindow({ - width: 600, - height: 500, - icon: __dirname + '/../resources/Icon.ico', - autoHideMenuBar: true, - transparent: true, - show: true, - frame: false, - hasShadow: true, - webPreferences: { - nodeIntegration: true, - }, - }); - - const close = () => { - tmpWindow.close(); - tmpWindow = null; - }; - - const onCancel = () => { - event.sender.send('screenShare:cancel'); - close(); - }; - - const onShare = (_, shareId) => { - event.sender.send('screenShare:share', shareId); - close(); - }; - - ipcMain.handle('screenShare:getSources', () => screenList); - ipcMain.on('screenShare:cancelSelection', onCancel); - ipcMain.on('screenShare:selectScreen', onShare); - - tmpWindow.on('closed', () => { - ipcMain.removeHandler('screenShare:getSources'); - ipcMain.removeAllListeners('screenShare:cancelSelection'); - ipcMain.removeAllListeners('screenShare:selectScreen'); - }); - - tmpWindow.loadFile(__dirname + '/../screenselector.html'); +ipcMain.on("screenShare:show", (event, screenList) => { + let tmpWindow = new BrowserWindow({ + width: 600, + height: 500, + icon: __dirname + "/../resources/Icon.ico", + autoHideMenuBar: true, + transparent: true, + show: true, + frame: false, + hasShadow: true, + webPreferences: { + nodeIntegration: true, + }, + }); + + const close = () => { + tmpWindow.close(); + tmpWindow = null; + }; + + const onCancel = () => { + event.sender.send("screenShare:cancel"); + close(); + }; + + const onShare = (_, shareId) => { + event.sender.send("screenShare:share", shareId); + close(); + }; + + ipcMain.handle("screenShare:getSources", () => screenList); + ipcMain.on("screenShare:cancelSelection", onCancel); + ipcMain.on("screenShare:selectScreen", onShare); + + tmpWindow.on("closed", () => { + ipcMain.removeHandler("screenShare:getSources"); + ipcMain.removeAllListeners("screenShare:cancelSelection"); + ipcMain.removeAllListeners("screenShare:selectScreen"); + }); + + tmpWindow.loadFile(__dirname + "/../screenselector.html"); }); - // Proxy -if ( config.get('proxy') ) { - app.commandLine.appendSwitch('proxy-server', config.get('proxyHost')+':'+config.get('proxyPort')); - app.on('login', (event, webContents, request, authInfo, callback) => { - if(!authInfo.isProxy) - return; - - event.preventDefault(); - callback(config.get('proxyLogin'), config.get('proxyPassword')) - }) +if (config.get("proxy")) { + app.commandLine.appendSwitch( + "proxy-server", + config.get("proxyHost") + ":" + config.get("proxyPort") + ); + app.on("login", (event, webContents, request, authInfo, callback) => { + if (!authInfo.isProxy) return; + + event.preventDefault(); + callback(config.get("proxyLogin"), config.get("proxyPassword")); + }); } // Disable GPU Acceleration for Linux // to prevent White Page bug // https://github.com/electron/electron/issues/6139 // https://github.com/saenzramiro/rambox/issues/181 -if ( config.get('disable_gpu') ) app.disableHardwareAcceleration(); +if (config.get("disable_gpu")) app.disableHardwareAcceleration(); // This method will be called when Electron has finished // initialization and is ready to create browser windows. -app.on('ready', function() { - config.get('master_password') ? createMasterPasswordWindow() : createWindow(); - // setInterval(availableSpaceWatchDog, 1000 * 60); +app.on("ready", function () { + config.get("master_password") ? createMasterPasswordWindow() : createWindow(); + // setInterval(availableSpaceWatchDog, 1000 * 60); }); // Quit when all windows are closed. -app.on('window-all-closed', function () { - // On OS X it is common for applications and their menu bar - // to stay active until the user quits explicitly with Cmd + Q - if (process.platform !== 'darwin') { - app.quit(); - } +app.on("window-all-closed", function () { + // On OS X it is common for applications and their menu bar + // to stay active until the user quits explicitly with Cmd + Q + if (process.platform !== "darwin") { + app.quit(); + } }); // Only macOS: On OS X it's common to re-create a window in the app when the // dock icon is clicked and there are no other windows open. -app.on('activate', function () { - if (mainWindow === null && mainMasterPasswordWindow === null ) { - config.get('master_password') ? createMasterPasswordWindow() : createWindow(); - } - - if (mainWindow) { - mainWindow.show(); - } +app.on("activate", function () { + if (mainWindow === null && mainMasterPasswordWindow === null) { + config.get("master_password") + ? createMasterPasswordWindow() + : createWindow(); + } + + if (mainWindow) { + mainWindow.show(); + } }); -app.on('before-quit', function () { - isQuitting = true; +app.on("before-quit", function () { + isQuitting = true; }); diff --git a/resources/css/screenselector.css b/resources/css/screenselector.css index c3f5314b..06c4f1fb 100644 --- a/resources/css/screenselector.css +++ b/resources/css/screenselector.css @@ -1,4 +1,5 @@ -html, body { +html, +body { width: 100%; height: 100%; margin: 0; @@ -36,7 +37,8 @@ html, body { -webkit-app-region: no-drag; } -.screen-selector ul.type li.active, .screen-selector ul.type li:hover { +.screen-selector ul.type li.active, +.screen-selector ul.type li:hover { color: #426ba3; border-color: #426ba3; } @@ -113,7 +115,6 @@ html, body { display: inline-block; width: 100%; border-top: solid 1px #cdcdcd; - } .screen-selector .footer button { diff --git a/resources/js/rambox-service-api.js b/resources/js/rambox-service-api.js index f4dbc01d..fd3156a4 100644 --- a/resources/js/rambox-service-api.js +++ b/resources/js/rambox-service-api.js @@ -2,8 +2,11 @@ * This file is loaded in the service web views to provide a Rambox API. */ -const { desktopCapturer, ipcRenderer } = require('electron'); -const { ContextMenuBuilder, ContextMenuListener } = require('electron-contextmenu-wrapper'); +const { desktopCapturer, ipcRenderer } = require("electron"); +const { + ContextMenuBuilder, + ContextMenuListener, +} = require("electron-contextmenu-wrapper"); /** * Make the Rambox API available via a global "rambox" variable. @@ -17,92 +20,107 @@ window.rambox = {}; * * @param {*} count The unread count */ -window.rambox.setUnreadCount = function(count) { - ipcRenderer.sendToHost('rambox.setUnreadCount', count); +window.rambox.setUnreadCount = function (count) { + ipcRenderer.sendToHost("rambox.setUnreadCount", count); }; /** * Clears the unread count. */ -window.rambox.clearUnreadCount = function() { - ipcRenderer.sendToHost('rambox.clearUnreadCount'); -} +window.rambox.clearUnreadCount = function () { + ipcRenderer.sendToHost("rambox.clearUnreadCount"); +}; /** * Override to add notification click event to display Rambox window and activate service tab */ var NativeNotification = Notification; -Notification = function(title, options) { - var notification = new NativeNotification(title, options); - - notification.addEventListener('click', function() { - ipcRenderer.sendToHost('rambox.showWindowAndActivateTab'); - }); +Notification = function (title, options) { + var notification = new NativeNotification(title, options); - //It seems that gmail is checking if such event handler func are available. Just remplacing them by a void function that is always returning true is making the thing right! - notification.addEventListener = function() {return true}; - notification.attachEvent = function() {return true}; - notification.addListener = function() {return true}; + notification.addEventListener("click", function () { + ipcRenderer.sendToHost("rambox.showWindowAndActivateTab"); + }); - return notification; -} + //It seems that gmail is checking if such event handler func are available. Just remplacing them by a void function that is always returning true is making the thing right! + notification.addEventListener = function () { + return true; + }; + notification.attachEvent = function () { + return true; + }; + notification.addListener = function () { + return true; + }; + + return notification; +}; Notification.prototype = NativeNotification.prototype; Notification.permission = NativeNotification.permission; -Notification.requestPermission = NativeNotification.requestPermission.bind(Notification); +Notification.requestPermission = NativeNotification.requestPermission.bind( + Notification +); window.rambox.contextMenuBuilder = new ContextMenuBuilder(); -window.rambox.contextMenuListener = new ContextMenuListener(function(event, info) { - window.rambox.contextMenuBuilder.showPopupMenu(info); -}); - -const mousetrap = require('mousetrap'); -mousetrap.bind(process.platform === 'darwin' ? ['command+left', 'command+right'] : ['alt+left', 'alt+right'], e => { - if (location.href.indexOf('slack.com') !== -1) return; - e.key === 'ArrowLeft' ? history.back() : history.forward(); +window.rambox.contextMenuListener = new ContextMenuListener(function ( + event, + info +) { + window.rambox.contextMenuBuilder.showPopupMenu(info); }); +const mousetrap = require("mousetrap"); +mousetrap.bind( + process.platform === "darwin" + ? ["command+left", "command+right"] + : ["alt+left", "alt+right"], + (e) => { + if (location.href.indexOf("slack.com") !== -1) return; + e.key === "ArrowLeft" ? history.back() : history.forward(); + } +); // ScreenShare window.navigator.mediaDevices.getDisplayMedia = () => new Promise(async (resolve, reject) => { try { const sources = await desktopCapturer.getSources({ - types: ['screen', 'window'], + types: ["screen", "window"], }); const unlisten = () => { - ipcRenderer.removeAllListeners('screenShare:cancel'); - ipcRenderer.removeAllListeners('screenShare:share'); + ipcRenderer.removeAllListeners("screenShare:cancel"); + ipcRenderer.removeAllListeners("screenShare:share"); }; - ipcRenderer.on('screenShare:cancel', () => { + ipcRenderer.on("screenShare:cancel", () => { unlisten(); - reject(new Error('Cancelled by user')); + reject(new Error("Cancelled by user")); }); - ipcRenderer.on('screenShare:share', (_, shareId) => { + ipcRenderer.on("screenShare:share", (_, shareId) => { unlisten(); window.navigator.mediaDevices .getUserMedia({ audio: false, video: { mandatory: { - chromeMediaSource: 'desktop', + chromeMediaSource: "desktop", chromeMediaSourceId: shareId, }, }, }) - .then(stream => resolve(stream)); + .then((stream) => resolve(stream)); }); - const mappedSources = sources.map(it => ({ + const mappedSources = sources.map((it) => ({ id: it.id, name: it.name, thumbnail: it.thumbnail.toDataURL(), })); - ipcRenderer.send('screenShare:show', mappedSources); + ipcRenderer.send("screenShare:show", mappedSources); } catch (err) { reject(err); } diff --git a/resources/js/screenselector.js b/resources/js/screenselector.js index 9f5b7a1a..65e33df3 100644 --- a/resources/js/screenselector.js +++ b/resources/js/screenselector.js @@ -1,77 +1,91 @@ -const { ipcRenderer } = require('electron'); +const { ipcRenderer } = require("electron"); -let sourceList, contentList, typeButtons, shareButton, cancelButton, activeItem, activeTab = 'screen'; +let sourceList, + contentList, + typeButtons, + shareButton, + cancelButton, + activeItem, + activeTab = "screen"; -const getItemDOM = item => { - const li = document.createElement('li'); - li.setAttribute('data-id', item.id); +const getItemDOM = (item) => { + const li = document.createElement("li"); + li.setAttribute("data-id", item.id); li.innerHTML = `
${item.name}
`; - li.addEventListener('click', onItemClick, false); + li.addEventListener("click", onItemClick, false); return li; }; const updateTab = () => { - const sources = sourceList.filter(it => it.id.indexOf(activeTab) === 0); - contentList.innerHTML = ''; - sources.forEach(source => contentList.appendChild(getItemDOM(source))); + const sources = sourceList.filter((it) => it.id.indexOf(activeTab) === 0); + contentList.innerHTML = ""; + sources.forEach((source) => contentList.appendChild(getItemDOM(source))); }; const bindTypeClick = () => { - typeButtons.forEach(it => it.addEventListener('click', onChangeType, false)); + typeButtons.forEach((it) => + it.addEventListener("click", onChangeType, false) + ); }; const bindActionsClick = () => { - shareButton.addEventListener('click', onShareClick, false); - cancelButton.addEventListener('click', onCancelClick, false); + shareButton.addEventListener("click", onShareClick, false); + cancelButton.addEventListener("click", onCancelClick, false); }; -const onChangeType = event => { +const onChangeType = (event) => { event.preventDefault(); - if (!event.target.classList.contains('active')) { + if (!event.target.classList.contains("active")) { activeTab = event.target.dataset.type; - typeButtons.forEach(it => it.classList.remove('active')); - event.target.classList.add('active'); + typeButtons.forEach((it) => it.classList.remove("active")); + event.target.classList.add("active"); updateTab(); } }; -const onItemClick = event => { +const onItemClick = (event) => { event.preventDefault(); - if (!event.currentTarget.classList.contains('active')) { + if (!event.currentTarget.classList.contains("active")) { activeItem = event.currentTarget.dataset.id; - document.querySelectorAll('.preview li').forEach(it => it.classList.remove('active')); - event.currentTarget.classList.add('active'); + document + .querySelectorAll(".preview li") + .forEach((it) => it.classList.remove("active")); + event.currentTarget.classList.add("active"); changeShareState(); } }; -const onCancelClick = event => { +const onCancelClick = (event) => { event.preventDefault(); - ipcRenderer.send('screenShare:cancelSelection'); + ipcRenderer.send("screenShare:cancelSelection"); }; -const onShareClick = event => { +const onShareClick = (event) => { event.preventDefault(); if (activeItem) { - ipcRenderer.send('screenShare:selectScreen', activeItem); + ipcRenderer.send("screenShare:selectScreen", activeItem); } }; const changeShareState = () => { - if (shareButton.getAttribute('disabled') !== null) { - shareButton.removeAttribute('disabled'); + if (shareButton.getAttribute("disabled") !== null) { + shareButton.removeAttribute("disabled"); } }; -window.addEventListener('load', async () => { - sourceList = await ipcRenderer.invoke('screenShare:getSources'); +window.addEventListener( + "load", + async () => { + sourceList = await ipcRenderer.invoke("screenShare:getSources"); - contentList = document.querySelector('.preview'); - typeButtons = document.querySelectorAll('.type li'); - shareButton = document.querySelector('#share'); - cancelButton = document.querySelector('#cancel'); + contentList = document.querySelector(".preview"); + typeButtons = document.querySelectorAll(".type li"); + shareButton = document.querySelector("#share"); + cancelButton = document.querySelector("#cancel"); - bindTypeClick(); - bindActionsClick(); - updateTab(); -}, false); + bindTypeClick(); + bindActionsClick(); + updateTab(); + }, + false +); diff --git a/screenselector.html b/screenselector.html index 61c43a95..3232fbef 100644 --- a/screenselector.html +++ b/screenselector.html @@ -1,22 +1,22 @@ - - - - -
- -
- + + + + +
+
    +
  • Entire Screen
    • +
  • Window
    • +
+
+
    +
    +
    + + +
    -
    - - -
    -
    - - + +