Minor refactoring

laurent22 · Aug 28, 2020 · bc36748 · bc36748
1 parent e274acd
commit bc36748
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/ElectronClient/app.js b/ElectronClient/app.js
@@ -30,7 +30,7 @@ const PluginManager = require('lib/services/PluginManager');
 const RevisionService = require('lib/services/RevisionService');
 const MigrationService = require('lib/services/MigrationService');
 const CommandService = require('lib/services/CommandService').default;
-const KeymapService = require('lib/services/KeymapService.js').default;
+const KeymapService = require('lib/services/KeymapService').default;
 const TemplateUtils = require('lib/TemplateUtils');
 const CssUtils = require('lib/CssUtils');
 const resourceEditWatcherReducer = require('lib/services/ResourceEditWatcher/reducer').default;

diff --git a/ElectronClient/gui/KeymapConfig/KeymapConfigScreen.tsx b/ElectronClient/gui/KeymapConfig/KeymapConfigScreen.tsx
@@ -8,7 +8,7 @@ import useKeymap from './utils/useKeymap';
 import useCommandStatus from './utils/useCommandStatus';
 import styles_ from './styles';
 
-const { _ } = require('lib/locale.js');
+const { _ } = require('lib/locale');
 const keymapService = KeymapService.instance();
 
 export interface KeymapConfigScreenProps {

diff --git a/ElectronClient/gui/KeymapConfig/ShortcutRecorder.tsx b/ElectronClient/gui/KeymapConfig/ShortcutRecorder.tsx
@@ -4,7 +4,7 @@ import { useState, useEffect, KeyboardEvent } from 'react';
 import KeymapService, { KeymapError } from '../../lib/services/KeymapService';
 import styles_ from './styles';
 
-const { _ } = require('lib/locale.js');
+const { _ } = require('lib/locale');
 const keymapService = KeymapService.instance();
 
 export interface ShortcutRecorderProps {

diff --git a/ElectronClient/gui/KeymapConfig/utils/getLabel.ts b/ElectronClient/gui/KeymapConfig/utils/getLabel.ts
@@ -1,7 +1,7 @@
 import CommandService from '../../../lib/services/CommandService';
 
-const { _ } = require('lib/locale.js');
-const { shim } = require('lib/shim.js');
+const { _ } = require('lib/locale');
+const { shim } = require('lib/shim');
 
 const commandService = CommandService.instance();
 

diff --git a/ReactNativeClient/lib/services/PluginManager.js b/ReactNativeClient/lib/services/PluginManager.js
@@ -1,5 +1,5 @@
 const { Logger } = require('lib/logger.js');
-const KeymapService = require('lib/services/KeymapService.js').default;
+const KeymapService = require('lib/services/KeymapService').default;
 
 class PluginManager {
 	constructor() {
@@ -81,6 +81,8 @@ class PluginManager {
 
 	menuItems() {
 		let output = [];
+		const keymapService = KeymapService.instance();
+
 		for (const name in this.plugins_) {
 			const menuItems = this.plugins_[name].Class.manifest.menuItems;
 			if (!menuItems) continue;
@@ -92,7 +94,7 @@ class PluginManager {
 						itemName: item.name,
 					});
 				};
-				item.accelerator = KeymapService.instance().getAccelerator(name);
+				item.accelerator = keymapService.getAccelerator(name);
 			}
 
 			output = output.concat(menuItems);