self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-11-06 09:19:22 +02:00
Code Issues Releases Activity

Desktop: Regression: Fixed external edit file watching

Browse Source
This commit is contained in:
Laurent Cozic
2020-11-16 11:03:44 +00:00
parent 6103aad2a7
commit a808281dd2
9 changed files with 66 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/app-desktop/app.ts
View File

@@ -21,6 +21,7 @@ import menuCommandNames from './gui/menuCommandNames';
import { LayoutItem } from './gui/ResizableLayout/utils/types';
import stateToWhenClauseContext from './services/commands/stateToWhenClauseContext';
import ResourceService from '@joplin/lib/services/ResourceService';
import ExternalEditWatcher from '@joplin/lib/services/ExternalEditWatcher';
const { FoldersScreenUtils } = require('@joplin/lib/folders-screen-utils.js');
const MasterKey = require('@joplin/lib/models/MasterKey');
@@ -31,7 +32,6 @@ const { reg } = require('@joplin/lib/registry.js');
const packageInfo = require('./packageInfo.js');
const DecryptionWorker = require('@joplin/lib/services/DecryptionWorker');
const ClipperServer = require('@joplin/lib/ClipperServer');
const ExternalEditWatcher = require('@joplin/lib/services/ExternalEditWatcher');
const { webFrame } = require('electron');
const Menu = bridge().Menu;
const PluginManager = require('@joplin/lib/services/PluginManager');
@@ -691,7 +691,7 @@ class Application extends BaseApplication {
}
ExternalEditWatcher.instance().setLogger(reg.logger());
ExternalEditWatcher.instance().dispatch = this.store().dispatch;
ExternalEditWatcher.instance().initialize(bridge, this.store().dispatch);
ResourceEditWatcher.instance().initialize(reg.logger(), (action: any) => { this.store().dispatch(action); });

2
packages/app-desktop/commands/startExternalEditing.ts
View File

@@ -1,8 +1,8 @@
import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplin/lib/services/CommandService';
import { _ } from '@joplin/lib/locale';
import { stateUtils } from '@joplin/lib/reducer';
import ExternalEditWatcher from '@joplin/lib/services/ExternalEditWatcher';
const Note = require('@joplin/lib/models/Note');
const ExternalEditWatcher = require('@joplin/lib/services/ExternalEditWatcher');
const bridge = require('electron').remote.require('./bridge').default;
export const declaration: CommandDeclaration = {

2
packages/app-desktop/commands/stopExternalEditing.ts
View File

@@ -1,7 +1,7 @@
import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplin/lib/services/CommandService';
import { _ } from '@joplin/lib/locale';
import { stateUtils } from '@joplin/lib/reducer';
const ExternalEditWatcher = require('@joplin/lib/services/ExternalEditWatcher');
import ExternalEditWatcher from '@joplin/lib/services/ExternalEditWatcher';
export const declaration: CommandDeclaration = {
name: 'stopExternalEditing',

2
packages/app-desktop/gui/NoteEditor/NoteEditor.tsx
View File

@@ -29,6 +29,7 @@ import markupLanguageUtils from '@joplin/lib/markupLanguageUtils';
import usePrevious from '../hooks/usePrevious';
import Setting from '@joplin/lib/models/Setting';
import stateToWhenClauseContext from '../../services/commands/stateToWhenClauseContext';
import ExternalEditWatcher from '@joplin/lib/services/ExternalEditWatcher';
const { themeStyle } = require('@joplin/lib/theme');
const { substrWithEllipsis } = require('@joplin/lib/string-utils');
@@ -36,7 +37,6 @@ const NoteSearchBar = require('../NoteSearchBar.min.js');
const { reg } = require('@joplin/lib/registry.js');
const Note = require('@joplin/lib/models/Note.js');
const bridge = require('electron').remote.require('./bridge').default;
const ExternalEditWatcher = require('@joplin/lib/services/ExternalEditWatcher');
const NoteRevisionViewer = require('../NoteRevisionViewer.min');
const commands = [