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

Desktop: Regression: Fixed check for update

Browse Source
This commit is contained in:
Laurent Cozic
2020-10-16 21:14:57 +01:00
parent 4309c4f8e2
commit 7e0e513051
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ElectronClient/gui/MenuBar.tsx
View File

@@ -251,7 +251,7 @@ function useMenu(props:Props) {
exportItems.push({ exportItems.push({
label: module.fullLabel(), label: module.fullLabel(),
click: async () => { click: async () => {
await InteropServiceHelper.export(props.dispatch.bind(this), module); await InteropServiceHelper.export((action:any) => props.dispatch(action), module);
}, },
}); });
} }
@@ -322,7 +322,7 @@ function useMenu(props:Props) {
click: async () => { click: async () => {
const templates = await TemplateUtils.loadTemplates(Setting.value('templateDir')); const templates = await TemplateUtils.loadTemplates(Setting.value('templateDir'));
this.store().dispatch({ props.dispatch({
type: 'TEMPLATE_UPDATE_ALL', type: 'TEMPLATE_UPDATE_ALL',
templates: templates, templates: templates,
}); });
@@ -358,8 +358,8 @@ function useMenu(props:Props) {
} }
toolsItems = toolsItems.concat(toolsItemsAll); toolsItems = toolsItems.concat(toolsItemsAll);
function _checkForUpdates(ctx:any) { function _checkForUpdates() {
bridge().checkForUpdates(false, bridge().window(), ctx.checkForUpdateLoggerPath(), { includePreReleases: Setting.value('autoUpdate.includePreReleases') }); bridge().checkForUpdates(false, bridge().window(), `${Setting.value('profileDir')}/log-autoupdater.txt`, { includePreReleases: Setting.value('autoUpdate.includePreReleases') });
} }
function _showAbout() { function _showAbout() {
@@ -405,7 +405,7 @@ function useMenu(props:Props) {
}, { }, {
label: _('Check for updates...'), label: _('Check for updates...'),
visible: shim.isMac() ? true : false, visible: shim.isMac() ? true : false,
click: () => _checkForUpdates(this), click: () => _checkForUpdates(),
}, { }, {
type: 'separator', type: 'separator',
visible: shim.isMac() ? true : false, visible: shim.isMac() ? true : false,
@@ -638,7 +638,7 @@ function useMenu(props:Props) {
}, { }, {
label: _('Check for updates...'), label: _('Check for updates...'),
visible: shim.isMac() ? false : true, visible: shim.isMac() ? false : true,
click: () => _checkForUpdates(this), click: () => _checkForUpdates(),
}, },
separator(), separator(),
{ {