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

Desktop: Fixes #4473: Improved enabling/disabling commands depending on application state

Browse Source
This commit is contained in:
Laurent Cozic 2021-02-07 10:09:28 +00:00
parent 526b16b931
commit c5b8d82234
2 changed files with 608 additions and 566 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1158
packages/app-desktop/gui/MenuBar.tsx
View File

File diff suppressed because it is too large Load Diff

16
packages/lib/services/plugins/WebviewController.ts
View File

@ -1,6 +1,6 @@
import ViewController, { EmitMessageEvent } from './ViewController';
import shim from '../../shim';
import { ButtonSpec, DialogResult } from './api/types';
import { ButtonSpec, DialogResult, ViewHandle } from './api/types';
const { toSystemSlashes } = require('../../path-utils');
export enum ContainerType {
@ -43,8 +43,8 @@ export default class WebviewController extends ViewController {
private messageListener_: Function = null;
private closeResponse_: CloseResponse = null;
public constructor(id: string, pluginId: string, store: any, baseDir: string, containerType: ContainerType) {
super(id, pluginId, store);
public constructor(handle: ViewHandle, pluginId: string, store: any, baseDir: string, containerType: ContainerType) {
super(handle, pluginId, store);
this.baseDir_ = toSystemSlashes(baseDir, 'linux');
this.store.dispatch({
@ -139,6 +139,11 @@ export default class WebviewController extends ViewController {
// ---------------------------------------------
public async open(): Promise<DialogResult> {
this.store.dispatch({
type: 'VISIBLE_DIALOGS_ADD',
name: this.handle,
});
this.setStoreProp('opened', true);
return new Promise((resolve: Function, reject: Function) => {
@ -147,6 +152,11 @@ export default class WebviewController extends ViewController {
}
public close() {
this.store.dispatch({
type: 'VISIBLE_DIALOGS_REMOVE',
name: this.handle,
});
this.setStoreProp('opened', false);
}