Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-27 12:04:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Working on progress indicator when loading webview

Browse Source
This commit is contained in:
Matt Bierner
2018-04-04 16:07:31 -07:00
parent 8b501bc0f4
commit caee7a5789
6 changed files with 43 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/vs/workbench/api/electron-browser/mainThreadWebview.ts
View File

@@ -129,8 +129,8 @@ export class MainThreadWebviews implements MainThreadWebviewsShape, WebviewReviv
this._revivers.delete(viewType);
}
reviveWebview(webview: WebviewEditorInput) {
this._extensionService.activateByEvent(`onView:${webview.state.viewType}`).then(() => {
reviveWebview(webview: WebviewEditorInput): TPromise<void> {
return this._extensionService.activateByEvent(`onView:${webview.state.viewType}`).then(() => {
const handle = 'revival-' + MainThreadWebviews.revivalPool++;
this._webviews.set(handle, webview);
@@ -145,7 +145,8 @@ export class MainThreadWebviews implements MainThreadWebviewsShape, WebviewReviv
}
};
this._proxy.$deserializeWebview(handle, webview.state.viewType, webview.state.state, webview.position, webview.options);
return this._proxy.$deserializeWebview(handle, webview.state.viewType, webview.state.state, webview.position, webview.options)
.then(() => { });
});
}

2
src/vs/workbench/api/node/extHost.protocol.ts
View File

@@ -366,7 +366,7 @@ export interface ExtHostWebviewsShape {
$onDidChangeActiveWeview(handle: WebviewHandle | undefined): void;
$onDidDisposeWeview(handle: WebviewHandle): Thenable<void>;
$onDidChangePosition(handle: WebviewHandle, newPosition: EditorPosition): void;
$deserializeWebview(newWebviewHandle: WebviewHandle, viewType: string, state: any, position: EditorPosition, options: vscode.WebviewOptions): void;
$deserializeWebview(newWebviewHandle: WebviewHandle, viewType: string, state: any, position: EditorPosition, options: vscode.WebviewOptions): Thenable<boolean>;
$serializeWebview(webviewHandle: WebviewHandle): Thenable<any>;
}

6
src/vs/workbench/api/node/extHostWebview.ts
View File

@@ -237,15 +237,15 @@ export class ExtHostWebviews implements ExtHostWebviewsShape {
state: any,
position: Position,
options: vscode.WebviewOptions
): void {
): TPromise<boolean> {
const serializer = this._serializers.get(viewType);
if (!serializer) {
return;
return TPromise.as(false);
}
const revivedWebview = new ExtHostWebview(webviewHandle, this._proxy, viewType, typeConverters.toViewColumn(position), options);
this._webviews.set(webviewHandle, revivedWebview);
serializer.deserializeWebview(revivedWebview, state);
return serializer.deserializeWebview(revivedWebview, state);
}
$serializeWebview(