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: Fixes #4098: Fix crash due to React when trying to upgrade sync target

Browse Source
This commit is contained in:
Laurent Cozic
2020-11-19 16:38:44 +00:00
parent 30913a5d58
commit 65962e26ce
4 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/app-desktop/gui/Root.tsx
View File

@@ -15,7 +15,6 @@ const { render } = require('react-dom');
const { connect, Provider } = require('react-redux');
const Setting = require('@joplin/lib/models/Setting').default;
const shim = require('@joplin/lib/shim').default;
shim.setReact(React);
const { ImportScreen } = require('./ImportScreen.min.js');
const { ResourceScreen } = require('./ResourceScreen.js');
const { Navigator } = require('./Navigator.min.js');

3
packages/app-desktop/main-html.js
View File

@@ -27,6 +27,7 @@ const { shimInit } = require('@joplin/lib/shim-init-node.js');
const EncryptionService = require('@joplin/lib/services/EncryptionService');
const bridge = require('electron').remote.require('./bridge').default;
const { FileApiDriverLocal } = require('@joplin/lib/file-api-driver-local.js');
const React = require('react');
if (bridge().env() === 'dev') {
const newConsole = function(oldConsole) {
@@ -86,7 +87,7 @@ try {
keytar = null;
}
shimInit(null, keytar);
shimInit(null, keytar, React);
// Disable drag and drop of links inside application (which would
// open it as if the whole app was a browser)