@theia/core 1.39.0-next.1 → 1.39.0-next.12
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +6 -6
- package/lib/browser/dialogs.d.ts +15 -9
- package/lib/browser/dialogs.d.ts.map +1 -1
- package/lib/browser/dialogs.js +67 -54
- package/lib/browser/dialogs.js.map +1 -1
- package/lib/browser/saveable.d.ts.map +1 -1
- package/lib/browser/saveable.js +4 -2
- package/lib/browser/saveable.js.map +1 -1
- package/lib/browser/secondary-window-handler.d.ts +2 -2
- package/lib/browser/secondary-window-handler.d.ts.map +1 -1
- package/lib/browser/secondary-window-handler.js +8 -34
- package/lib/browser/secondary-window-handler.js.map +1 -1
- package/lib/browser/styling-service.d.ts +5 -2
- package/lib/browser/styling-service.d.ts.map +1 -1
- package/lib/browser/styling-service.js +15 -5
- package/lib/browser/styling-service.js.map +1 -1
- package/lib/browser/widgets/widget.d.ts +1 -0
- package/lib/browser/widgets/widget.d.ts.map +1 -1
- package/lib/browser/widgets/widget.js +7 -3
- package/lib/browser/widgets/widget.js.map +1 -1
- package/lib/browser/window/default-secondary-window-service.d.ts +5 -3
- package/lib/browser/window/default-secondary-window-service.d.ts.map +1 -1
- package/lib/browser/window/default-secondary-window-service.js +62 -18
- package/lib/browser/window/default-secondary-window-service.js.map +1 -1
- package/lib/browser/window/secondary-window-service.d.ts +3 -1
- package/lib/browser/window/secondary-window-service.d.ts.map +1 -1
- package/lib/browser/window/secondary-window-service.js.map +1 -1
- package/lib/common/message-rpc/rpc-message-encoder.d.ts +3 -3
- package/lib/common/message-rpc/rpc-message-encoder.d.ts.map +1 -1
- package/lib/common/message-rpc/rpc-message-encoder.js +2 -2
- package/lib/common/message-rpc/rpc-message-encoder.js.map +1 -1
- package/lib/common/message-rpc/rpc-protocol.d.ts +1 -1
- package/lib/common/message-rpc/rpc-protocol.d.ts.map +1 -1
- package/lib/common/message-rpc/rpc-protocol.js +8 -4
- package/lib/common/message-rpc/rpc-protocol.js.map +1 -1
- package/lib/common/messaging/proxy-factory.d.ts +6 -6
- package/lib/common/messaging/proxy-factory.d.ts.map +1 -1
- package/lib/common/messaging/proxy-factory.js +11 -10
- package/lib/common/messaging/proxy-factory.js.map +1 -1
- package/lib/electron-browser/preload.d.ts.map +1 -1
- package/lib/electron-browser/preload.js +20 -15
- package/lib/electron-browser/preload.js.map +1 -1
- package/lib/electron-browser/window/electron-secondary-window-service.d.ts +3 -1
- package/lib/electron-browser/window/electron-secondary-window-service.d.ts.map +1 -1
- package/lib/electron-browser/window/electron-secondary-window-service.js +7 -2
- package/lib/electron-browser/window/electron-secondary-window-service.js.map +1 -1
- package/lib/electron-common/electron-api.d.ts +2 -0
- package/lib/electron-common/electron-api.d.ts.map +1 -1
- package/lib/electron-common/electron-api.js +2 -1
- package/lib/electron-common/electron-api.js.map +1 -1
- package/lib/electron-main/electron-api-main.d.ts +1 -0
- package/lib/electron-main/electron-api-main.d.ts.map +1 -1
- package/lib/electron-main/electron-api-main.js +16 -0
- package/lib/electron-main/electron-api-main.js.map +1 -1
- package/lib/electron-main/theia-electron-window.d.ts +1 -0
- package/lib/electron-main/theia-electron-window.d.ts.map +1 -1
- package/lib/electron-main/theia-electron-window.js +32 -0
- package/lib/electron-main/theia-electron-window.js.map +1 -1
- package/package.json +4 -4
- package/src/browser/dialogs.ts +69 -52
- package/src/browser/saveable.ts +4 -2
- package/src/browser/secondary-window-handler.ts +7 -38
- package/src/browser/styling-service.ts +17 -6
- package/src/browser/widgets/widget.ts +4 -0
- package/src/browser/window/default-secondary-window-service.ts +67 -18
- package/src/browser/window/secondary-window-service.ts +4 -1
- package/src/common/message-rpc/rpc-message-encoder.ts +4 -4
- package/src/common/message-rpc/rpc-protocol.ts +8 -4
- package/src/common/messaging/proxy-factory.ts +13 -15
- package/src/electron-browser/preload.ts +21 -1
- package/src/electron-browser/window/electron-secondary-window-service.ts +8 -2
- package/src/electron-common/electron-api.ts +4 -0
- package/src/electron-main/electron-api-main.ts +19 -1
- package/src/electron-main/theia-electron-window.ts +30 -0
|
@@ -43,7 +43,11 @@ class RpcProtocol {
|
|
|
43
43
|
this.encoder = (_a = options.encoder) !== null && _a !== void 0 ? _a : new rpc_message_encoder_1.MsgPackMessageEncoder();
|
|
44
44
|
this.decoder = (_b = options.decoder) !== null && _b !== void 0 ? _b : new rpc_message_encoder_1.MsgPackMessageDecoder();
|
|
45
45
|
this.toDispose.push(this.onNotificationEmitter);
|
|
46
|
-
channel.onClose(
|
|
46
|
+
channel.onClose(event => {
|
|
47
|
+
this.pendingRequests.forEach(pending => pending.reject(new Error(event.reason)));
|
|
48
|
+
this.pendingRequests.clear();
|
|
49
|
+
this.toDispose.dispose();
|
|
50
|
+
});
|
|
47
51
|
this.toDispose.push(channel.onMessage(readBuffer => this.handleMessage(this.decoder.parse(readBuffer()))));
|
|
48
52
|
this.mode = (_c = options.mode) !== null && _c !== void 0 ? _c : 'default';
|
|
49
53
|
if (this.mode !== 'clientOnly' && requestHandler === undefined) {
|
|
@@ -65,7 +69,7 @@ class RpcProtocol {
|
|
|
65
69
|
return;
|
|
66
70
|
}
|
|
67
71
|
case 2 /* Notification */: {
|
|
68
|
-
this.handleNotify(message.
|
|
72
|
+
this.handleNotify(message.method, message.args, message.id);
|
|
69
73
|
return;
|
|
70
74
|
}
|
|
71
75
|
}
|
|
@@ -139,7 +143,7 @@ class RpcProtocol {
|
|
|
139
143
|
return;
|
|
140
144
|
}
|
|
141
145
|
const output = this.channel.getWriteBuffer();
|
|
142
|
-
this.encoder.notification(output,
|
|
146
|
+
this.encoder.notification(output, method, args, this.nextMessageId++);
|
|
143
147
|
output.commit();
|
|
144
148
|
}
|
|
145
149
|
sendCancel(requestId) {
|
|
@@ -181,7 +185,7 @@ class RpcProtocol {
|
|
|
181
185
|
errorOutput.commit();
|
|
182
186
|
}
|
|
183
187
|
}
|
|
184
|
-
async handleNotify(
|
|
188
|
+
async handleNotify(method, args, id) {
|
|
185
189
|
if (this.toDispose.disposed) {
|
|
186
190
|
return;
|
|
187
191
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rpc-protocol.js","sourceRoot":"","sources":["../../../src/common/message-rpc/rpc-protocol.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,+CAA+C;AAC/C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;AAChF,uDAAuD;;;AAEvD,kDAA6E;AAC7E,8CAAiE;AACjE,oCAA0C;AAC1C,kDAA2C;AAE3C,+DAAuJ;AAyBvJ;;;;;;;GAOG;AACH,MAAa,WAAW;IAoBpB,YAA4B,OAAgB,EAAkB,cAA0C,EAAE,UAA8B,EAAE;;QAA9G,YAAO,GAAP,OAAO,CAAS;QAAkB,mBAAc,GAAd,cAAc,CAA4B;QAjBrF,oBAAe,GAA+B,IAAI,GAAG,EAAE,CAAC;QAEjE,kBAAa,GAAW,CAAC,CAAC;QAMjB,0BAAqB,GAA8C,IAAI,eAAO,EAAE,CAAC;QACjF,6BAAwB,GAAG,IAAI,GAAG,EAAmC,CAAC;QAM/E,cAAS,GAAG,IAAI,iCAAoB,EAAE,CAAC;QAG7C,IAAI,CAAC,OAAO,GAAG,MAAA,OAAO,CAAC,OAAO,mCAAI,IAAI,2CAAqB,EAAE,CAAC;QAC9D,IAAI,CAAC,OAAO,GAAG,MAAA,OAAO,CAAC,OAAO,mCAAI,IAAI,2CAAqB,EAAE,CAAC;QAC9D,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;QAChD,OAAO,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"rpc-protocol.js","sourceRoot":"","sources":["../../../src/common/message-rpc/rpc-protocol.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ import { Emitter, Event } from '../event';
|
|
|
3
3
|
import { Channel } from '../message-rpc/channel';
|
|
4
4
|
import { RequestHandler, RpcProtocol } from '../message-rpc/rpc-protocol';
|
|
5
5
|
import { ConnectionHandler } from './handler';
|
|
6
|
+
import { Deferred } from '../promise-util';
|
|
6
7
|
export declare type JsonRpcServer<Client> = Disposable & {
|
|
7
8
|
/**
|
|
8
9
|
* If this server is a proxy to a remote server then
|
|
@@ -25,9 +26,9 @@ export declare class JsonRpcConnectionHandler<T extends object> implements Conne
|
|
|
25
26
|
onConnection(connection: Channel): void;
|
|
26
27
|
}
|
|
27
28
|
/**
|
|
28
|
-
* Factory for creating a new {@link
|
|
29
|
+
* Factory for creating a new {@link RpcProtocol} for a given chanel and {@link RequestHandler}.
|
|
29
30
|
*/
|
|
30
|
-
export declare type
|
|
31
|
+
export declare type RpcProtocolFactory = (channel: Channel, requestHandler: RequestHandler) => RpcProtocol;
|
|
31
32
|
/**
|
|
32
33
|
* Factory for JSON-RPC proxy objects.
|
|
33
34
|
*
|
|
@@ -72,18 +73,17 @@ export declare type RpcConnectionFactory = (channel: Channel, requestHandler: Re
|
|
|
72
73
|
*/
|
|
73
74
|
export declare class JsonRpcProxyFactory<T extends object> implements ProxyHandler<T> {
|
|
74
75
|
target?: any;
|
|
75
|
-
protected
|
|
76
|
+
protected rpcProtocolFactory: RpcProtocolFactory;
|
|
76
77
|
protected readonly onDidOpenConnectionEmitter: Emitter<void>;
|
|
77
78
|
protected readonly onDidCloseConnectionEmitter: Emitter<void>;
|
|
78
|
-
protected
|
|
79
|
-
protected connectionPromise: Promise<RpcProtocol>;
|
|
79
|
+
protected rpcDeferred: Deferred<RpcProtocol>;
|
|
80
80
|
/**
|
|
81
81
|
* Build a new JsonRpcProxyFactory.
|
|
82
82
|
*
|
|
83
83
|
* @param target - The object to expose to JSON-RPC methods calls. If this
|
|
84
84
|
* is omitted, the proxy won't be able to handle requests, only send them.
|
|
85
85
|
*/
|
|
86
|
-
constructor(target?: any,
|
|
86
|
+
constructor(target?: any, rpcProtocolFactory?: RpcProtocolFactory);
|
|
87
87
|
protected waitForConnection(): void;
|
|
88
88
|
/**
|
|
89
89
|
* Connect a MessageConnection to the factory.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proxy-factory.d.ts","sourceRoot":"","sources":["../../../src/common/messaging/proxy-factory.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAC1C,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1E,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"proxy-factory.d.ts","sourceRoot":"","sources":["../../../src/common/messaging/proxy-factory.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,6 +21,7 @@ const rpc_message_encoder_1 = require("../message-rpc/rpc-message-encoder");
|
|
|
21
21
|
const application_error_1 = require("../application-error");
|
|
22
22
|
const event_1 = require("../event");
|
|
23
23
|
const rpc_protocol_1 = require("../message-rpc/rpc-protocol");
|
|
24
|
+
const promise_util_1 = require("../promise-util");
|
|
24
25
|
class JsonRpcConnectionHandler {
|
|
25
26
|
constructor(path, targetFactory, factoryConstructor = JsonRpcProxyFactory) {
|
|
26
27
|
this.path = path;
|
|
@@ -35,7 +36,7 @@ class JsonRpcConnectionHandler {
|
|
|
35
36
|
}
|
|
36
37
|
}
|
|
37
38
|
exports.JsonRpcConnectionHandler = JsonRpcConnectionHandler;
|
|
38
|
-
const
|
|
39
|
+
const defaultRpcProtocolFactory = (channel, requestHandler) => new rpc_protocol_1.RpcProtocol(channel, requestHandler);
|
|
39
40
|
/**
|
|
40
41
|
* Factory for JSON-RPC proxy objects.
|
|
41
42
|
*
|
|
@@ -85,17 +86,17 @@ class JsonRpcProxyFactory {
|
|
|
85
86
|
* @param target - The object to expose to JSON-RPC methods calls. If this
|
|
86
87
|
* is omitted, the proxy won't be able to handle requests, only send them.
|
|
87
88
|
*/
|
|
88
|
-
constructor(target,
|
|
89
|
+
constructor(target, rpcProtocolFactory = defaultRpcProtocolFactory) {
|
|
89
90
|
this.target = target;
|
|
90
|
-
this.
|
|
91
|
+
this.rpcProtocolFactory = rpcProtocolFactory;
|
|
91
92
|
this.onDidOpenConnectionEmitter = new event_1.Emitter();
|
|
92
93
|
this.onDidCloseConnectionEmitter = new event_1.Emitter();
|
|
93
94
|
this.waitForConnection();
|
|
94
95
|
}
|
|
95
96
|
waitForConnection() {
|
|
96
|
-
this.
|
|
97
|
-
this.
|
|
98
|
-
|
|
97
|
+
this.rpcDeferred = new promise_util_1.Deferred();
|
|
98
|
+
this.rpcDeferred.promise.then(protocol => {
|
|
99
|
+
protocol.channel.onClose(() => {
|
|
99
100
|
this.onDidCloseConnectionEmitter.fire(undefined);
|
|
100
101
|
// Wait for connection in case the backend reconnects
|
|
101
102
|
this.waitForConnection();
|
|
@@ -110,9 +111,9 @@ class JsonRpcProxyFactory {
|
|
|
110
111
|
* response.
|
|
111
112
|
*/
|
|
112
113
|
listen(channel) {
|
|
113
|
-
const
|
|
114
|
-
|
|
115
|
-
this.
|
|
114
|
+
const protocol = this.rpcProtocolFactory(channel, (meth, args) => this.onRequest(meth, ...args));
|
|
115
|
+
protocol.onNotification(event => this.onNotification(event.method, ...event.args));
|
|
116
|
+
this.rpcDeferred.resolve(protocol);
|
|
116
117
|
}
|
|
117
118
|
/**
|
|
118
119
|
* Process an incoming JSON-RPC method call.
|
|
@@ -213,7 +214,7 @@ class JsonRpcProxyFactory {
|
|
|
213
214
|
return (...args) => {
|
|
214
215
|
const method = p.toString();
|
|
215
216
|
const capturedError = new Error(`Request '${method}' failed`);
|
|
216
|
-
return this.
|
|
217
|
+
return this.rpcDeferred.promise.then(connection => new Promise((resolve, reject) => {
|
|
217
218
|
try {
|
|
218
219
|
if (isNotify) {
|
|
219
220
|
connection.sendNotification(method, args);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proxy-factory.js","sourceRoot":"","sources":["../../../src/common/messaging/proxy-factory.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;AAEhF,uDAAuD;AAEvD,4EAAmE;AACnE,4DAAwD;AAExD,oCAA0C;AAE1C,8DAA0E;
|
|
1
|
+
{"version":3,"file":"proxy-factory.js","sourceRoot":"","sources":["../../../src/common/messaging/proxy-factory.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preload.d.ts","sourceRoot":"","sources":["../../src/electron-browser/preload.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"preload.d.ts","sourceRoot":"","sources":["../../src/electron-browser/preload.ts"],"names":[],"mappings":"AAsNA,wBAAgB,OAAO,IAAI,IAAI,CAa9B"}
|
|
@@ -1,21 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.preload = void 0;
|
|
4
|
-
// *****************************************************************************
|
|
5
|
-
// Copyright (C) 2023 STMicroelectronics and others.
|
|
6
|
-
//
|
|
7
|
-
// This program and the accompanying materials are made available under the
|
|
8
|
-
// terms of the Eclipse Public License v. 2.0 which is available at
|
|
9
|
-
// http://www.eclipse.org/legal/epl-2.0.
|
|
10
|
-
//
|
|
11
|
-
// This Source Code may also be made available under the following Secondary
|
|
12
|
-
// Licenses when the conditions for such availability set forth in the Eclipse
|
|
13
|
-
// Public License v. 2.0 are satisfied: GNU General Public License, version 2
|
|
14
|
-
// with the GNU Classpath Exception which is available at
|
|
15
|
-
// https://www.gnu.org/software/classpath/license.html.
|
|
16
|
-
//
|
|
17
|
-
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
18
|
-
//
|
|
19
4
|
const disposable_1 = require("../common/disposable");
|
|
20
5
|
const electron_api_1 = require("../electron-common/electron-api");
|
|
21
6
|
// eslint-disable-next-line import/no-extraneous-dependencies
|
|
@@ -124,6 +109,26 @@ const api = {
|
|
|
124
109
|
event.sender.send(cancelChannel);
|
|
125
110
|
});
|
|
126
111
|
},
|
|
112
|
+
setSecondaryWindowCloseRequestHandler(windowName, handler) {
|
|
113
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
114
|
+
const listener = async (event, name, confirmChannel, cancelChannel) => {
|
|
115
|
+
if (name === windowName) {
|
|
116
|
+
try {
|
|
117
|
+
if (await handler()) {
|
|
118
|
+
event.sender.send(confirmChannel);
|
|
119
|
+
ipcRenderer.removeListener(electron_api_1.CHANNEL_REQUEST_SECONDARY_CLOSE, listener);
|
|
120
|
+
return;
|
|
121
|
+
}
|
|
122
|
+
;
|
|
123
|
+
}
|
|
124
|
+
catch (e) {
|
|
125
|
+
console.warn('exception in close handler ', e);
|
|
126
|
+
}
|
|
127
|
+
event.sender.send(cancelChannel);
|
|
128
|
+
}
|
|
129
|
+
};
|
|
130
|
+
ipcRenderer.on(electron_api_1.CHANNEL_REQUEST_SECONDARY_CLOSE, listener);
|
|
131
|
+
},
|
|
127
132
|
toggleDevTools: function () {
|
|
128
133
|
ipcRenderer.send(electron_api_1.CHANNEL_TOGGLE_DEVTOOLS);
|
|
129
134
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preload.js","sourceRoot":"","sources":["../../src/electron-browser/preload.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"preload.js","sourceRoot":"","sources":["../../src/electron-browser/preload.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { DefaultSecondaryWindowService } from '../../browser/window/default-secondary-window-service';
|
|
2
|
+
import { ApplicationShell, ExtractableWidget } from 'src/browser';
|
|
2
3
|
export declare class ElectronSecondaryWindowService extends DefaultSecondaryWindowService {
|
|
3
4
|
focus(win: Window): void;
|
|
4
|
-
protected doCreateSecondaryWindow(
|
|
5
|
+
protected doCreateSecondaryWindow(widget: ExtractableWidget, shell: ApplicationShell): Window | undefined;
|
|
6
|
+
private canClose;
|
|
5
7
|
}
|
|
6
8
|
//# sourceMappingURL=electron-secondary-window-service.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"electron-secondary-window-service.d.ts","sourceRoot":"","sources":["../../../src/electron-browser/window/electron-secondary-window-service.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,6BAA6B,EAAE,MAAM,uDAAuD,CAAC;
|
|
1
|
+
{"version":3,"file":"electron-secondary-window-service.d.ts","sourceRoot":"","sources":["../../../src/electron-browser/window/electron-secondary-window-service.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,6BAA6B,EAAE,MAAM,uDAAuD,CAAC;AACtG,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAElE,qBACa,8BAA+B,SAAQ,6BAA6B;IACpE,KAAK,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;cAId,uBAAuB,CAAC,MAAM,EAAE,iBAAiB,EAAE,KAAK,EAAE,gBAAgB,GAAG,MAAM,GAAG,SAAS;YAQpG,QAAQ;CAIzB"}
|
|
@@ -28,13 +28,18 @@ let ElectronSecondaryWindowService = class ElectronSecondaryWindowService extend
|
|
|
28
28
|
focus(win) {
|
|
29
29
|
window.electronTheiaCore.focusWindow(win.name);
|
|
30
30
|
}
|
|
31
|
-
doCreateSecondaryWindow(
|
|
32
|
-
const w = super.doCreateSecondaryWindow(
|
|
31
|
+
doCreateSecondaryWindow(widget, shell) {
|
|
32
|
+
const w = super.doCreateSecondaryWindow(widget, shell);
|
|
33
33
|
if (w) {
|
|
34
34
|
window.electronTheiaCore.setMenuBarVisible(false, w.name);
|
|
35
|
+
window.electronTheiaCore.setSecondaryWindowCloseRequestHandler(w.name, () => this.canClose(widget, shell));
|
|
35
36
|
}
|
|
36
37
|
return w;
|
|
37
38
|
}
|
|
39
|
+
async canClose(widget, shell) {
|
|
40
|
+
await shell.closeWidget(widget.id, undefined);
|
|
41
|
+
return widget.isDisposed;
|
|
42
|
+
}
|
|
38
43
|
};
|
|
39
44
|
ElectronSecondaryWindowService = __decorate([
|
|
40
45
|
(0, inversify_1.injectable)()
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"electron-secondary-window-service.js","sourceRoot":"","sources":["../../../src/electron-browser/window/electron-secondary-window-service.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,kFAAkF;AAClF,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;;;;;;;AAEhF,yCAAuC;AACvC,4GAAsG;
|
|
1
|
+
{"version":3,"file":"electron-secondary-window-service.js","sourceRoot":"","sources":["../../../src/electron-browser/window/electron-secondary-window-service.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,kFAAkF;AAClF,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;;;;;;;AAEhF,yCAAuC;AACvC,4GAAsG;AAItG,IAAa,8BAA8B,GAA3C,MAAa,8BAA+B,SAAQ,gEAA6B;IACpE,KAAK,CAAC,GAAW;QACtB,MAAM,CAAC,iBAAiB,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACnD,CAAC;IAEkB,uBAAuB,CAAC,MAAyB,EAAE,KAAuB;QACzF,MAAM,CAAC,GAAG,KAAK,CAAC,uBAAuB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACvD,IAAI,CAAC,EAAE;YACH,MAAM,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;YAC1D,MAAM,CAAC,iBAAiB,CAAC,qCAAqC,CAAC,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC;SAC9G;QACD,OAAO,CAAC,CAAC;IACb,CAAC;IACO,KAAK,CAAC,QAAQ,CAAC,MAAyB,EAAE,KAAuB;QACrE,MAAM,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;QAC9C,OAAO,MAAM,CAAC,UAAU,CAAC;IAC7B,CAAC;CACJ,CAAA;AAjBY,8BAA8B;IAD1C,IAAA,sBAAU,GAAE;GACA,8BAA8B,CAiB1C;AAjBY,wEAA8B"}
|
|
@@ -37,6 +37,7 @@ export interface TheiaCoreAPI {
|
|
|
37
37
|
close(): void;
|
|
38
38
|
onWindowEvent(event: WindowEvent, handler: () => void): Disposable;
|
|
39
39
|
setCloseRequestHandler(handler: (reason: StopReason) => Promise<boolean>): void;
|
|
40
|
+
setSecondaryWindowCloseRequestHandler(windowName: string, handler: () => Promise<boolean>): void;
|
|
40
41
|
toggleDevTools(): void;
|
|
41
42
|
getZoomLevel(): Promise<number>;
|
|
42
43
|
setZoomLevel(desired: number): void;
|
|
@@ -83,6 +84,7 @@ export declare const CHANNEL_SET_ZOOM_LEVEL = "SetZoomLevel";
|
|
|
83
84
|
export declare const CHANNEL_IS_FULL_SCREENABLE = "IsFullScreenable";
|
|
84
85
|
export declare const CHANNEL_IS_FULL_SCREEN = "IsFullScreen";
|
|
85
86
|
export declare const CHANNEL_TOGGLE_FULL_SCREEN = "ToggleFullScreen";
|
|
87
|
+
export declare const CHANNEL_REQUEST_SECONDARY_CLOSE = "RequestSecondaryClose";
|
|
86
88
|
export declare const CHANNEL_REQUEST_CLOSE = "RequestClose";
|
|
87
89
|
export declare const CHANNEL_REQUEST_RELOAD = "RequestReload";
|
|
88
90
|
export declare const CHANNEL_RESTART = "Restart";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"electron-api.d.ts","sourceRoot":"","sources":["../../src/electron-common/electron-api.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"electron-api.d.ts","sourceRoot":"","sources":["../../src/electron-common/electron-api.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
16
16
|
// *****************************************************************************
|
|
17
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
|
-
exports.CHANNEL_IPC_CONNECTION = exports.CHANNEL_KEYBOARD_LAYOUT_CHANGED = exports.CHANNEL_WRITE_CLIPBOARD = exports.CHANNEL_READ_CLIPBOARD = exports.CHANNEL_APP_STATE_CHANGED = exports.CHANNEL_RESTART = exports.CHANNEL_REQUEST_RELOAD = exports.CHANNEL_REQUEST_CLOSE = exports.CHANNEL_TOGGLE_FULL_SCREEN = exports.CHANNEL_IS_FULL_SCREEN = exports.CHANNEL_IS_FULL_SCREENABLE = exports.CHANNEL_SET_ZOOM_LEVEL = exports.CHANNEL_GET_ZOOM_LEVEL = exports.CHANNEL_TOGGLE_DEVTOOLS = exports.CHANNEL_ON_WINDOW_EVENT = exports.CHANNEL_UNMAXIMIZE = exports.CHANNEL_IS_MAXIMIZED = exports.CHANNEL_MAXIMIZE = exports.CHANNEL_MINIMIZE = exports.CHANNEL_CLOSE = exports.CHANNEL_SET_TITLE_STYLE = exports.CHANNEL_GET_TITLE_STYLE_AT_STARTUP = exports.CHANNEL_ATTACH_SECURITY_TOKEN = exports.CHANNEL_SHOW_ITEM_IN_FOLDER = exports.CHANNEL_SHOW_SAVE = exports.CHANNEL_SHOW_OPEN = exports.CHANNEL_FOCUS_WINDOW = exports.CHANNEL_GET_SECURITY_TOKEN = exports.CHANNEL_CLOSE_POPUP = exports.CHANNEL_ON_CLOSE_POPUP = exports.CHANNEL_OPEN_POPUP = exports.CHANNEL_INVOKE_MENU = exports.CHANNEL_SET_MENU_BAR_VISIBLE = exports.CHANNEL_SET_MENU = void 0;
|
|
18
|
+
exports.CHANNEL_IPC_CONNECTION = exports.CHANNEL_KEYBOARD_LAYOUT_CHANGED = exports.CHANNEL_WRITE_CLIPBOARD = exports.CHANNEL_READ_CLIPBOARD = exports.CHANNEL_APP_STATE_CHANGED = exports.CHANNEL_RESTART = exports.CHANNEL_REQUEST_RELOAD = exports.CHANNEL_REQUEST_CLOSE = exports.CHANNEL_REQUEST_SECONDARY_CLOSE = exports.CHANNEL_TOGGLE_FULL_SCREEN = exports.CHANNEL_IS_FULL_SCREEN = exports.CHANNEL_IS_FULL_SCREENABLE = exports.CHANNEL_SET_ZOOM_LEVEL = exports.CHANNEL_GET_ZOOM_LEVEL = exports.CHANNEL_TOGGLE_DEVTOOLS = exports.CHANNEL_ON_WINDOW_EVENT = exports.CHANNEL_UNMAXIMIZE = exports.CHANNEL_IS_MAXIMIZED = exports.CHANNEL_MAXIMIZE = exports.CHANNEL_MINIMIZE = exports.CHANNEL_CLOSE = exports.CHANNEL_SET_TITLE_STYLE = exports.CHANNEL_GET_TITLE_STYLE_AT_STARTUP = exports.CHANNEL_ATTACH_SECURITY_TOKEN = exports.CHANNEL_SHOW_ITEM_IN_FOLDER = exports.CHANNEL_SHOW_SAVE = exports.CHANNEL_SHOW_OPEN = exports.CHANNEL_FOCUS_WINDOW = exports.CHANNEL_GET_SECURITY_TOKEN = exports.CHANNEL_CLOSE_POPUP = exports.CHANNEL_ON_CLOSE_POPUP = exports.CHANNEL_OPEN_POPUP = exports.CHANNEL_INVOKE_MENU = exports.CHANNEL_SET_MENU_BAR_VISIBLE = exports.CHANNEL_SET_MENU = void 0;
|
|
19
19
|
exports.CHANNEL_SET_MENU = 'SetMenu';
|
|
20
20
|
exports.CHANNEL_SET_MENU_BAR_VISIBLE = 'SetMenuBarVisible';
|
|
21
21
|
exports.CHANNEL_INVOKE_MENU = 'InvokeMenu';
|
|
@@ -42,6 +42,7 @@ exports.CHANNEL_SET_ZOOM_LEVEL = 'SetZoomLevel';
|
|
|
42
42
|
exports.CHANNEL_IS_FULL_SCREENABLE = 'IsFullScreenable';
|
|
43
43
|
exports.CHANNEL_IS_FULL_SCREEN = 'IsFullScreen';
|
|
44
44
|
exports.CHANNEL_TOGGLE_FULL_SCREEN = 'ToggleFullScreen';
|
|
45
|
+
exports.CHANNEL_REQUEST_SECONDARY_CLOSE = 'RequestSecondaryClose';
|
|
45
46
|
exports.CHANNEL_REQUEST_CLOSE = 'RequestClose';
|
|
46
47
|
exports.CHANNEL_REQUEST_RELOAD = 'RequestReload';
|
|
47
48
|
exports.CHANNEL_RESTART = 'Restart';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"electron-api.js","sourceRoot":"","sources":["../../src/electron-common/electron-api.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,oDAAoD;AACpD,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;
|
|
1
|
+
{"version":3,"file":"electron-api.js","sourceRoot":"","sources":["../../src/electron-common/electron-api.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,oDAAoD;AACpD,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;AAkFnE,QAAA,gBAAgB,GAAG,SAAS,CAAC;AAC7B,QAAA,4BAA4B,GAAG,mBAAmB,CAAC;AACnD,QAAA,mBAAmB,GAAG,YAAY,CAAC;AACnC,QAAA,kBAAkB,GAAG,WAAW,CAAC;AACjC,QAAA,sBAAsB,GAAG,cAAc,CAAC;AACxC,QAAA,mBAAmB,GAAG,YAAY,CAAC;AACnC,QAAA,0BAA0B,GAAG,kBAAkB,CAAC;AAChD,QAAA,oBAAoB,GAAG,aAAa,CAAC;AACrC,QAAA,iBAAiB,GAAG,gBAAgB,CAAC;AACrC,QAAA,iBAAiB,GAAG,gBAAgB,CAAC;AACrC,QAAA,2BAA2B,GAAG,kBAAkB,CAAC;AACjD,QAAA,6BAA6B,GAAG,qBAAqB,CAAC;AAEtD,QAAA,kCAAkC,GAAG,wBAAwB,CAAC;AAC9D,QAAA,uBAAuB,GAAG,eAAe,CAAC;AAC1C,QAAA,aAAa,GAAG,OAAO,CAAC;AACxB,QAAA,gBAAgB,GAAG,UAAU,CAAC;AAC9B,QAAA,gBAAgB,GAAG,UAAU,CAAC;AAC9B,QAAA,oBAAoB,GAAG,aAAa,CAAC;AAErC,QAAA,kBAAkB,GAAG,YAAY,CAAC;AAClC,QAAA,uBAAuB,GAAG,eAAe,CAAC;AAC1C,QAAA,uBAAuB,GAAG,gBAAgB,CAAC;AAC3C,QAAA,sBAAsB,GAAG,cAAc,CAAC;AACxC,QAAA,sBAAsB,GAAG,cAAc,CAAC;AACxC,QAAA,0BAA0B,GAAG,kBAAkB,CAAC;AAChD,QAAA,sBAAsB,GAAG,cAAc,CAAC;AACxC,QAAA,0BAA0B,GAAG,kBAAkB,CAAC;AAEhD,QAAA,+BAA+B,GAAG,uBAAuB,CAAC;AAE1D,QAAA,qBAAqB,GAAG,cAAc,CAAC;AACvC,QAAA,sBAAsB,GAAG,eAAe,CAAC;AACzC,QAAA,eAAe,GAAG,SAAS,CAAC;AAE5B,QAAA,yBAAyB,GAAG,yBAAyB,CAAC;AAEtD,QAAA,sBAAsB,GAAG,eAAe,CAAC;AACzC,QAAA,uBAAuB,GAAG,gBAAgB,CAAC;AAE3C,QAAA,+BAA+B,GAAG,uBAAuB,CAAC;AAC1D,QAAA,sBAAsB,GAAG,eAAe,CAAC"}
|
|
@@ -13,6 +13,7 @@ export declare class TheiaMainApi implements ElectronMainApplicationContribution
|
|
|
13
13
|
export declare namespace TheiaRendererAPI {
|
|
14
14
|
function sendWindowEvent(wc: WebContents, event: WindowEvent): void;
|
|
15
15
|
function requestClose(wc: WebContents, stopReason: StopReason): Promise<boolean>;
|
|
16
|
+
function requestSecondaryClose(mainWindow: WebContents, secondaryWindow: WebContents): Promise<boolean>;
|
|
16
17
|
function onRequestReload(wc: WebContents, handler: () => void): Disposable;
|
|
17
18
|
function onApplicationStateChanged(wc: WebContents, handler: (state: FrontendApplicationState) => void): Disposable;
|
|
18
19
|
function onIpcData(handler: (sender: WebContents, data: Uint8Array) => void): Disposable;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"electron-api-main.d.ts","sourceRoot":"","sources":["../../src/electron-main/electron-api-main.ts"],"names":[],"mappings":"AAgBA,OAAO,EACqB,IAAI,EAAE,0BAA0B,EAAe,WAAW,EACrF,MAAM,iCAAiC,CAAC;AAIzC,OAAO,EAAE,wBAAwB,EAAE,UAAU,EAAE,MAAM,sCAAsC,CAAC;AAC5F,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EASH,WAAW,EAeX,eAAe,
|
|
1
|
+
{"version":3,"file":"electron-api-main.d.ts","sourceRoot":"","sources":["../../src/electron-main/electron-api-main.ts"],"names":[],"mappings":"AAgBA,OAAO,EACqB,IAAI,EAAE,0BAA0B,EAAe,WAAW,EACrF,MAAM,iCAAiC,CAAC;AAIzC,OAAO,EAAE,wBAAwB,EAAE,UAAU,EAAE,MAAM,sCAAsC,CAAC;AAC5F,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EASH,WAAW,EAeX,eAAe,EAKlB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,uBAAuB,EAAE,mCAAmC,EAAE,MAAM,6BAA6B,CAAC;AAC3G,OAAO,EAAE,UAAU,EAA+B,YAAY,EAAE,MAAM,WAAW,CAAC;AAGlF,qBACa,YAAa,YAAW,mCAAmC;IAEpE,SAAS,CAAC,qBAAqB,EAAE,qBAAqB,CAAC;IAEvD,SAAS,CAAC,QAAQ,CAAC,UAAU,oBAA2B;IAExD,OAAO,CAAC,WAAW,EAAE,uBAAuB,GAAG,YAAY,CAAC,IAAI,CAAC;IA2JjE,WAAW,CAAC,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,EAAE,GAAG,0BAA0B,EAAE;CAwB7G;AAID,yBAAiB,gBAAgB,CAAC;IAC9B,SAAgB,eAAe,CAAC,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,WAAW,GAAG,IAAI,CAEzE;IAED,SAAgB,YAAY,CAAC,EAAE,EAAE,WAAW,EAAE,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,CAetF;IAED,SAAgB,qBAAqB,CAAC,UAAU,EAAE,WAAW,EAAE,eAAe,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,CAe7G;IAED,SAAgB,eAAe,CAAC,EAAE,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,IAAI,GAAG,UAAU,CAEhF;IAED,SAAgB,yBAAyB,CAAC,EAAE,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC,KAAK,EAAE,wBAAwB,KAAK,IAAI,GAAG,UAAU,CAEzH;IAED,SAAgB,SAAS,CAAC,OAAO,EAAE,CAAC,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,UAAU,KAAK,IAAI,GAAG,UAAU,CAE9F;IAED,SAAgB,QAAQ,CAAC,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,UAAU,GAAG,IAAI,CAEhE;CASJ"}
|
|
@@ -236,6 +236,22 @@ var TheiaRendererAPI;
|
|
|
236
236
|
}).finally(() => disposables.dispose());
|
|
237
237
|
}
|
|
238
238
|
TheiaRendererAPI.requestClose = requestClose;
|
|
239
|
+
function requestSecondaryClose(mainWindow, secondaryWindow) {
|
|
240
|
+
const channelNr = nextReplyChannel++;
|
|
241
|
+
const confirmChannel = `confirm-${channelNr}`;
|
|
242
|
+
const cancelChannel = `cancel-${channelNr}`;
|
|
243
|
+
const disposables = new common_1.DisposableCollection();
|
|
244
|
+
return new Promise(resolve => {
|
|
245
|
+
mainWindow.send(electron_api_1.CHANNEL_REQUEST_SECONDARY_CLOSE, secondaryWindow.mainFrame.name, confirmChannel, cancelChannel);
|
|
246
|
+
(0, event_utils_1.createDisposableListener)(electron_1.ipcMain, confirmChannel, e => {
|
|
247
|
+
resolve(true);
|
|
248
|
+
}, disposables);
|
|
249
|
+
(0, event_utils_1.createDisposableListener)(electron_1.ipcMain, cancelChannel, e => {
|
|
250
|
+
resolve(false);
|
|
251
|
+
}, disposables);
|
|
252
|
+
}).finally(() => disposables.dispose());
|
|
253
|
+
}
|
|
254
|
+
TheiaRendererAPI.requestSecondaryClose = requestSecondaryClose;
|
|
239
255
|
function onRequestReload(wc, handler) {
|
|
240
256
|
return createWindowListener(wc, electron_api_1.CHANNEL_REQUEST_RELOAD, handler);
|
|
241
257
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"electron-api-main.js","sourceRoot":"","sources":["../../src/electron-main/electron-api-main.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,oDAAoD;AACpD,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;;;;;;;;;;AAEhF,8DAEyC;AACzC,qEAAqE;AAErE,yCAA+C;AAE/C,sEAA0E;AAC1E,
|
|
1
|
+
{"version":3,"file":"electron-api-main.js","sourceRoot":"","sources":["../../src/electron-main/electron-api-main.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,6 +31,7 @@ export declare class TheiaElectronWindow {
|
|
|
31
31
|
protected closeIsConfirmed: boolean;
|
|
32
32
|
protected applicationState: FrontendApplicationState;
|
|
33
33
|
protected init(): void;
|
|
34
|
+
protected attachSecondaryWindowListener(): void;
|
|
34
35
|
/**
|
|
35
36
|
* Only show the window when the content is ready.
|
|
36
37
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"theia-electron-window.d.ts","sourceRoot":"","sources":["../../src/electron-main/theia-electron-window.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,yBAAyB,EAAE,MAAM,4BAA4B,CAAC;AACvE,OAAO,EAAE,wBAAwB,EAAE,UAAU,EAAE,MAAM,sCAAsC,CAAC;AAC5F,OAAO,EAAE,aAAa,EAAE,+BAA+B,EAAE,MAAM,gCAAgC,CAAC;AAEhG,OAAO,EAAE,8BAA8B,EAAE,MAAM,2BAA2B,CAAC;AAC3E,OAAO,EAAE,oBAAoB,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AAMjE;;GAEG;AACH,MAAM,WAAW,yBAA0B,SAAQ,+BAA+B;IAC9E,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB;;;;OAIG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,eAAO,MAAM,yBAAyB,eAAsC,CAAC;AAE7E,eAAO,MAAM,uBAAuB,eAAoC,CAAC;AACzE,oBAAY,uBAAuB,GAAG,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"theia-electron-window.d.ts","sourceRoot":"","sources":["../../src/electron-main/theia-electron-window.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,yBAAyB,EAAE,MAAM,4BAA4B,CAAC;AACvE,OAAO,EAAE,wBAAwB,EAAE,UAAU,EAAE,MAAM,sCAAsC,CAAC;AAC5F,OAAO,EAAE,aAAa,EAAE,+BAA+B,EAAE,MAAM,gCAAgC,CAAC;AAEhG,OAAO,EAAE,8BAA8B,EAAE,MAAM,2BAA2B,CAAC;AAC3E,OAAO,EAAE,oBAAoB,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AAMjE;;GAEG;AACH,MAAM,WAAW,yBAA0B,SAAQ,+BAA+B;IAC9E,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB;;;;OAIG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,eAAO,MAAM,yBAAyB,eAAsC,CAAC;AAE7E,eAAO,MAAM,uBAAuB,eAAoC,CAAC;AACzE,oBAAY,uBAAuB,GAAG,yBAAyB,CAAC;AAQhE,qBACa,mBAAmB;IACO,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,yBAAyB,CAAC;IACxD,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,uBAAuB,CAAC;IAC5C,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,8BAA8B,CAAC;IAEnG,SAAS,CAAC,iBAAiB,gBAAuB;IAElD,IAAI,UAAU,IAAI,KAAK,CAAC,IAAI,CAAC,CAE5B;IAED,SAAS,CAAC,QAAQ,CAAC,SAAS,uBAAoD;IAEhF,SAAS,CAAC,OAAO,EAAE,aAAa,CAAC;IACjC,IAAI,MAAM,IAAI,aAAa,CAE1B;IAED,SAAS,CAAC,gBAAgB,UAAS;IACnC,SAAS,CAAC,gBAAgB,EAAE,wBAAwB,CAAU;IAG9D,SAAS,CAAC,IAAI,IAAI,IAAI;IAWtB,SAAS,CAAC,6BAA6B,IAAI,IAAI;IAuB/C;;OAEG;IACH,SAAS,CAAC,iBAAiB,IAAI,IAAI;IAInC,SAAS,CAAC,oBAAoB,IAAI,IAAI;IAetC,SAAS,CAAC,aAAa,IAAI,IAAI;IAK/B,KAAK,CAAC,MAAM,GAAE,UAA6B,GAAG,OAAO,CAAC,OAAO,CAAC;IAI9D,SAAS,CAAC,MAAM,IAAI,IAAI;cAOR,iBAAiB,CAAC,cAAc,EAAE,MAAM,OAAO,EAAE,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC;IAsBtG,SAAS,CAAC,eAAe,CAAC,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC;IAI/D,SAAS,CAAC,qBAAqB,IAAI,IAAI;IAQvC,SAAS,CAAC,qBAAqB,IAAI,IAAI;IAMvC,SAAS,CAAC,oBAAoB,IAAI,IAAI;IAItC,OAAO,IAAI,IAAI;CAGlB;AAED,MAAM,WAAW,0BAA0B;IACvC,CAAC,OAAO,EAAE,yBAAyB,EAAE,MAAM,EAAE,yBAAyB,GAAG,mBAAmB,CAAC;CAChG;AAED,eAAO,MAAM,0BAA0B,eAAuC,CAAC"}
|
|
@@ -36,6 +36,12 @@ const file_uri_1 = require("../node/file-uri");
|
|
|
36
36
|
const electron_api_main_1 = require("./electron-api-main");
|
|
37
37
|
exports.TheiaBrowserWindowOptions = Symbol('TheiaBrowserWindowOptions');
|
|
38
38
|
exports.WindowApplicationConfig = Symbol('WindowApplicationConfig');
|
|
39
|
+
var ClosingState;
|
|
40
|
+
(function (ClosingState) {
|
|
41
|
+
ClosingState[ClosingState["initial"] = 0] = "initial";
|
|
42
|
+
ClosingState[ClosingState["inProgress"] = 1] = "inProgress";
|
|
43
|
+
ClosingState[ClosingState["readyToClose"] = 2] = "readyToClose";
|
|
44
|
+
})(ClosingState || (ClosingState = {}));
|
|
39
45
|
let TheiaElectronWindow = class TheiaElectronWindow {
|
|
40
46
|
constructor() {
|
|
41
47
|
this.onDidCloseEmitter = new common_1.Emitter();
|
|
@@ -57,6 +63,32 @@ let TheiaElectronWindow = class TheiaElectronWindow {
|
|
|
57
63
|
this.attachCloseListeners();
|
|
58
64
|
this.trackApplicationState();
|
|
59
65
|
this.attachReloadListener();
|
|
66
|
+
this.attachSecondaryWindowListener();
|
|
67
|
+
}
|
|
68
|
+
attachSecondaryWindowListener() {
|
|
69
|
+
(0, event_utils_1.createDisposableListener)(this._window.webContents, 'did-create-window', (newWindow) => {
|
|
70
|
+
let closingState = ClosingState.initial;
|
|
71
|
+
newWindow.on('close', event => {
|
|
72
|
+
if (closingState === ClosingState.initial) {
|
|
73
|
+
closingState = ClosingState.inProgress;
|
|
74
|
+
event.preventDefault();
|
|
75
|
+
electron_api_main_1.TheiaRendererAPI.requestSecondaryClose(this._window.webContents, newWindow.webContents).then(shouldClose => {
|
|
76
|
+
if (shouldClose) {
|
|
77
|
+
closingState = ClosingState.readyToClose;
|
|
78
|
+
newWindow.close();
|
|
79
|
+
}
|
|
80
|
+
else {
|
|
81
|
+
closingState = ClosingState.initial;
|
|
82
|
+
}
|
|
83
|
+
});
|
|
84
|
+
}
|
|
85
|
+
else if (closingState === ClosingState.inProgress) {
|
|
86
|
+
// When the extracted widget is disposed programmatically, a dispose listener on it will try to close the window.
|
|
87
|
+
// if we dispose the widget because of closing the window, we'll get a recursive call to window.close()
|
|
88
|
+
event.preventDefault();
|
|
89
|
+
}
|
|
90
|
+
});
|
|
91
|
+
});
|
|
60
92
|
}
|
|
61
93
|
/**
|
|
62
94
|
* Only show the window when the content is ready.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"theia-electron-window.js","sourceRoot":"","sources":["../../src/electron-main/theia-electron-window.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;;;;;;;;;;AAGhF,qFAA4F;AAC5F,6DAAgG;AAChG,sDAA2E;AAC3E,uEAA2E;AAC3E,sCAAiE;AACjE,+CAAyD;AACzD,uCAAoC;AACpC,+CAA2C;AAC3C,2DAAuD;AAgB1C,QAAA,yBAAyB,GAAG,MAAM,CAAC,2BAA2B,CAAC,CAAC;AAEhE,QAAA,uBAAuB,GAAG,MAAM,CAAC,yBAAyB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"theia-electron-window.js","sourceRoot":"","sources":["../../src/electron-main/theia-electron-window.ts"],"names":[],"mappings":"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"}
|