Applied style guide spacing.

This commit is contained in:
Keith Maika 2022-03-29 17:19:49 -04:00
parent 50c0978148
commit 9436bb9802
No known key found for this signature in database
GPG Key ID: F71740E8722C75F1
8 changed files with 34 additions and 34 deletions

View File

@ -2,9 +2,9 @@ const credentials = await import('../credentials.js');
converse.plugins.add('converse-desktop-credentials', { converse.plugins.add('converse-desktop-credentials', {
initialize() { initialize () {
const {_converse} = this; const { _converse } = this;
const {api} = _converse; const { api } = _converse;
api.listen.on('afterResourceBinding', () => { api.listen.on('afterResourceBinding', () => {
if (_converse.connection.pass) { if (_converse.connection.pass) {

View File

@ -2,11 +2,11 @@
converse.plugins.add('converse-desktop-trayicon', { converse.plugins.add('converse-desktop-trayicon', {
initialize() { initialize () {
const {_converse} = this; const { _converse } = this;
let envelopeIsShowing = false; let envelopeIsShowing = false;
async function hideEnvelope() { async function hideEnvelope () {
if (envelopeIsShowing) { if (envelopeIsShowing) {
await api.trayService.hideEnvelope(); await api.trayService.hideEnvelope();
envelopeIsShowing = false; envelopeIsShowing = false;

View File

@ -1,13 +1,13 @@
/* global api */ /* global api */
async function addCredentials(connectionManager, login, password) { async function addCredentials (connectionManager, login, password) {
const xmppService = login.split('@').pop() const xmppService = login.split('@').pop()
await api.settings.set('connectionManager', connectionManager) await api.settings.set('connectionManager', connectionManager)
await api.settings.set('login', login) await api.settings.set('login', login)
await api.keytar.setPassword(xmppService, login, password) await api.keytar.setPassword(xmppService, login, password)
} }
async function getCredentials() { async function getCredentials () {
const credentials = {} const credentials = {}
credentials.login = (await api.settings.get('login')) || ''; credentials.login = (await api.settings.get('login')) || '';
if (credentials.login) { if (credentials.login) {
@ -19,7 +19,7 @@ async function getCredentials() {
return credentials; return credentials;
} }
async function removeCredentials(login) { async function removeCredentials (login) {
const xmppService = login.split('@').pop(); const xmppService = login.split('@').pop();
await api.keytar.deletePassword(xmppService, login); await api.keytar.deletePassword(xmppService, login);
await api.settings.unset('login'); await api.settings.unset('login');

10
main.js
View File

@ -1,5 +1,5 @@
// Modules to control application life and create native browser window // Modules to control application life and create native browser window
const {app, BrowserWindow, ipcMain, shell} = require('electron') const { app, BrowserWindow, ipcMain, shell } = require('electron')
const path = require('path'); const path = require('path');
// Keep a global reference of the window object, if you don't, the window will // Keep a global reference of the window object, if you don't, the window will
@ -14,7 +14,7 @@ const settingsService = require(__dirname + '/modules/settings-service')
const isMac = process.platform === 'darwin' const isMac = process.platform === 'darwin'
const isWin = process.platform === 'win32' const isWin = process.platform === 'win32'
function initApp() { function initApp () {
if (!app.requestSingleInstanceLock()) { if (!app.requestSingleInstanceLock()) {
app.quit(); app.quit();
} }
@ -26,7 +26,7 @@ function initApp() {
} }
} }
function createWindow() { function createWindow () {
// Main window options // Main window options
const mainWindowOptions = { const mainWindowOptions = {
zoomToPageWidth: true, zoomToPageWidth: true,
@ -61,7 +61,7 @@ function createWindow() {
// Handle shutdown event on Mac with minimizeOnClose // Handle shutdown event on Mac with minimizeOnClose
// to prevent shutdown interrupt // to prevent shutdown interrupt
if (isMac) { if (isMac) {
const {powerMonitor} = require('electron') const { powerMonitor } = require('electron')
powerMonitor.on('shutdown', () => { powerMonitor.on('shutdown', () => {
app.isQuitting = true app.isQuitting = true
app.quit() app.quit()
@ -87,7 +87,7 @@ function createWindow() {
shell.openExternal(details.url).catch((reason) => { shell.openExternal(details.url).catch((reason) => {
console.log(reason); console.log(reason);
}); });
return {action: 'deny'}; return { action: 'deny' };
}) })
ipcMain.handle('settings', (e, method, ...args) => { ipcMain.handle('settings', (e, method, ...args) => {

View File

@ -1,7 +1,7 @@
/** /**
* Module for Menu functions. * Module for Menu functions.
*/ */
const {app, Menu, MenuItem} = require('electron') const { app, Menu, MenuItem } = require('electron')
const settingsService = require(__dirname + '/../modules/settings-service') const settingsService = require(__dirname + '/../modules/settings-service')
const menuService = {} const menuService = {}

View File

@ -2,7 +2,7 @@
* Module for Tray functions. * Module for Tray functions.
*/ */
const { Tray } = require('electron') const { Tray } = require('electron')
const path = require('path') const path = require('path')
@ -13,18 +13,18 @@ const trayService = {}
const getTrayServiceIcon = (iconName = 'icon') => { const getTrayServiceIcon = (iconName = 'icon') => {
let iconImage; let iconImage;
if (process.platform === 'darwin' || process.platform === 'win32') { if (process.platform === 'darwin' || process.platform === 'win32') {
iconImage = iconName+'-16x16' iconImage = iconName + '-16x16'
} else { } else {
iconImage = iconName+'-48x48' iconImage = iconName + '-48x48'
} }
return path.join(__dirname, '..','resources','images', iconImage + '.png') return path.join(__dirname, '..', 'resources', 'images', iconImage + '.png')
} }
trayService.initTray = (window) => { trayService.initTray = (window) => {
const iconPath = getTrayServiceIcon() const iconPath = getTrayServiceIcon()
tray = new Tray(iconPath) tray = new Tray(iconPath)
tray.setToolTip('Converse Desktop') tray.setToolTip('Converse Desktop')
tray.on('click', function() { tray.on('click', function () {
window.webContents.send('open-unread-chat') window.webContents.send('open-unread-chat')
trayService.hideEnvelope() trayService.hideEnvelope()
window.show() window.show()

View File

@ -1,42 +1,42 @@
const {ipcRenderer, contextBridge} = require('electron'); const { ipcRenderer, contextBridge } = require('electron');
const keytar = require('keytar'); const keytar = require('keytar');
contextBridge.exposeInMainWorld('api', { contextBridge.exposeInMainWorld('api', {
settings: { settings: {
has(setting) { has (setting) {
return ipcRenderer.invoke('settings', 'has', setting); return ipcRenderer.invoke('settings', 'has', setting);
}, },
set(setting, value) { set (setting, value) {
return ipcRenderer.invoke('settings', 'set', setting, value); return ipcRenderer.invoke('settings', 'set', setting, value);
}, },
unset(setting) { unset (setting) {
return ipcRenderer.invoke('settings', 'unset', setting); return ipcRenderer.invoke('settings', 'unset', setting);
}, },
get(setting) { get (setting) {
return ipcRenderer.invoke('settings', 'get', setting); return ipcRenderer.invoke('settings', 'get', setting);
} }
}, },
trayService: { trayService: {
showEnvelope() { showEnvelope () {
return ipcRenderer.invoke('trayService', 'showEnvelope'); return ipcRenderer.invoke('trayService', 'showEnvelope');
}, },
hideEnvelope() { hideEnvelope () {
return ipcRenderer.invoke('trayService', 'hideEnvelope'); return ipcRenderer.invoke('trayService', 'hideEnvelope');
} }
}, },
keytar: { keytar: {
getPassword(service, login) { getPassword (service, login) {
return keytar.getPassword(service, login); return keytar.getPassword(service, login);
}, },
setPassword(service, login, password) { setPassword (service, login, password) {
return keytar.setPassword(service, login, password); return keytar.setPassword(service, login, password);
}, },
deletePassword(service, login) { deletePassword (service, login) {
return keytar.deletePassword(service, login); return keytar.deletePassword(service, login);
} }
}, },
app: { app: {
quit() { quit () {
ipcRenderer.send('app-quit'); ipcRenderer.send('app-quit');
} }
} }

View File

@ -6,7 +6,7 @@ const getCredentials = (await import('./app/credentials.js')).getCredentials;
let websocket_url, bosh_service_url; let websocket_url, bosh_service_url;
const {connectionManager, login, password} = await getCredentials() const { connectionManager, login, password } = await getCredentials()
if (connectionManager?.startsWith('ws')) { if (connectionManager?.startsWith('ws')) {
websocket_url = connectionManager websocket_url = connectionManager
@ -15,8 +15,8 @@ if (connectionManager?.startsWith('ws')) {
} }
converse.plugins.add('converse-debug', { converse.plugins.add('converse-debug', {
initialize() { initialize () {
const {_converse} = this; const { _converse } = this;
window._converse = _converse; window._converse = _converse;
} }
}); });