From 581663761d44d91bf00a96956823b92d354d2bf1 Mon Sep 17 00:00:00 2001 From: vantezzen Date: Mon, 2 Mar 2020 10:05:58 +0100 Subject: Run linter --- src/lib/Menu.js | 2 +- src/stores/SettingsStore.js | 7 +++++-- src/webview/contextMenu.js | 32 +++++++++++++++++--------------- 3 files changed, 23 insertions(+), 18 deletions(-) (limited to 'src') diff --git a/src/lib/Menu.js b/src/lib/Menu.js index 1c4cc6ab5..6d5eb0095 100644 --- a/src/lib/Menu.js +++ b/src/lib/Menu.js @@ -819,7 +819,7 @@ export default class FranzMenu { locked: true, }, }); - } + }, }); if (serviceTpl.length > 0) { diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js index 26e83b725..71d4e1702 100644 --- a/src/stores/SettingsStore.js +++ b/src/stores/SettingsStore.js @@ -1,5 +1,7 @@ import { ipcRenderer, remote } from 'electron'; -import { action, computed, observable, reaction } from 'mobx'; +import { + action, computed, observable, reaction, +} from 'mobx'; import localStorage from 'mobx-localstorage'; import { DEFAULT_APP_SETTINGS, FILE_SYSTEM_SETTINGS_TYPES, LOCAL_SERVER } from '../config'; import { API } from '../environment'; @@ -12,6 +14,7 @@ const debug = require('debug')('Ferdi:SettingsStore'); export default class SettingsStore extends Store { @observable updateAppSettingsRequest = new Request(this.api.local, 'updateAppSettings'); + startup = true; fileSystemSettingsTypes = FILE_SYSTEM_SETTINGS_TYPES; @@ -103,7 +106,7 @@ export default class SettingsStore extends Store { // So we lock manually window.ferdi.stores.router.push('/auth/locked'); } - }) + }); } debug('Get appSettings resolves', resp.type, resp.data); Object.assign(this._fileSystemSettingsCache[resp.type], resp.data); diff --git a/src/webview/contextMenu.js b/src/webview/contextMenu.js index e77ff2326..eeb825ece 100644 --- a/src/webview/contextMenu.js +++ b/src/webview/contextMenu.js @@ -1,34 +1,36 @@ -import { remote } from "electron"; -import { ContextMenuBuilder, ContextMenuListener } from "electron-spellchecker"; +import { remote } from 'electron'; +import { ContextMenuBuilder, ContextMenuListener } from 'electron-spellchecker'; const webContents = remote.getCurrentWebContents(); export default async function setupContextMenu(handler) { - const processMenu = (menu, menuInfo) => { + const addCustomMenuItems = (menu, menuInfo) => { + // Add "Paste as plain text" item when right-clicking editable content if ( - menuInfo.editFlags.canPaste && - !menuInfo.linkText && - !menuInfo.hasImageContents + menuInfo.editFlags.canPaste + && !menuInfo.linkText + && !menuInfo.hasImageContents ) { menu.insert( 3, new remote.MenuItem({ - label: "Paste as plain text", - accelerator: "CommandOrControl+Shift+V", - click: () => webContents.pasteAndMatchStyle() - }) + label: 'Paste as plain text', + accelerator: 'CommandOrControl+Shift+V', + click: () => webContents.pasteAndMatchStyle(), + }), ); } + // Add "Open Link in Ferdi" item for links if (menuInfo.linkURL) { menu.insert( 2, new remote.MenuItem({ - label: "Open Link in Ferdi", + label: 'Open Link in Ferdi', click: () => { window.location.href = menuInfo.linkURL; - } - }) + }, + }), ); } @@ -39,10 +41,10 @@ export default async function setupContextMenu(handler) { handler, null, true, - processMenu + addCustomMenuItems, ); // eslint-disable-next-line no-new - new ContextMenuListener(info => { + new ContextMenuListener((info) => { contextMenuBuilder.showPopupMenu(info); }); } -- cgit v1.2.3-70-g09d2