Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Reset simple browser localResourceRoots on reload #172834

Merged
merged 1 commit into from Jan 31, 2023
Merged

Reset simple browser localResourceRoots on reload #172834

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
26 changes: 18 additions & 8 deletions extensions/simple-browser/src/simpleBrowserView.ts
View file
Open in desktop
Expand Up @@ -17,6 +17,20 @@ export class SimpleBrowserView extends Disposable {
public static readonly viewType = 'simpleBrowser.view';
private static readonly title = vscode.l10n.t("Simple Browser");

private static getWebviewLocalResourceRoots(extensionUri: vscode.Uri): readonly vscode.Uri[] {
return [
vscode.Uri.joinPath(extensionUri, 'media')
];
}

private static getWebviewOptions(extensionUri: vscode.Uri): vscode.WebviewOptions {
return {
enableScripts: true,
enableForms: true,
localResourceRoots: SimpleBrowserView.getWebviewLocalResourceRoots(extensionUri),
};
}

private readonly _webviewPanel: vscode.WebviewPanel;

private readonly _onDidDispose = this._register(new vscode.EventEmitter<void>());
Expand All @@ -31,22 +45,18 @@ export class SimpleBrowserView extends Disposable {
viewColumn: showOptions?.viewColumn ?? vscode.ViewColumn.Active,
preserveFocus: showOptions?.preserveFocus
}, {
enableScripts: true,
enableForms: true,
retainContextWhenHidden: true,
localResourceRoots: [
vscode.Uri.joinPath(extensionUri, 'media')
]
...SimpleBrowserView.getWebviewOptions(extensionUri)
});
return new SimpleBrowserView(extensionUri, url, webview);
}

public static restore(
extensionUri: vscode.Uri,
url: string,
webview: vscode.WebviewPanel,
webviewPanel: vscode.WebviewPanel,
): SimpleBrowserView {
return new SimpleBrowserView(extensionUri, url, webview);
return new SimpleBrowserView(extensionUri, url, webviewPanel);
}

private constructor(
Expand All @@ -57,6 +67,7 @@ export class SimpleBrowserView extends Disposable {
super();

this._webviewPanel = this._register(webviewPanel);
this._webviewPanel.webview.options = SimpleBrowserView.getWebviewOptions(extensionUri);

this._register(this._webviewPanel.webview.onDidReceiveMessage(e => {
switch (e.type) {
Expand Down Expand Up @@ -171,7 +182,6 @@ function escapeAttribute(value: string | vscode.Uri): string {
return value.toString().replace(/"/g, '&quot;');
}


function getNonce() {
let text = '';
const possible = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
Expand Down