self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-06-24 23:26:50 +02:00
Code Issues Releases Activity

Merge branch 'dev' of github.com:laurent22/joplin into dev

Browse Source
This commit is contained in:
Laurent Cozic
2020-11-13 23:37:24 +00:00
parent 67f0739d3c 872d2942b4
commit 7151a48138
56 changed files with 681 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
import ViewController from './ViewController';
import shim from '../../shim';
import { ButtonId, ButtonSpec } from './api/types';
import { ButtonSpec, DialogResult } from './api/types';
const { toSystemSlashes } = require('../../path-utils');
export enum ContainerType {
@ -95,7 +95,7 @@ export default class WebviewController extends ViewController {
// Specific to dialogs
// ---------------------------------------------
public async open(): Promise<ButtonId> {
public async open(): Promise<DialogResult> {
this.setStoreProp('opened', true);
return new Promise((resolve: Function, reject: Function) => {
@ -107,7 +107,7 @@ export default class WebviewController extends ViewController {
this.setStoreProp('opened', false);
}
public closeWithResponse(result: ButtonId) {
public closeWithResponse(result: DialogResult) {
this.close();
this.closeResponse_.resolve(result);
}