development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-05 19:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reset simple browser localResourceRoots on reload (#172834)

Browse source 
This makes us set the `localResourceRoots` when the simple browser is reloaded. In codespaces when switching from stable to insiders, this reload can change the extensionUrl, so we can't use the old local resource roots
This commit is contained in:
Matt Bierner 2023-01-30 16:46:47 -08:00 committed by GitHub
parent 5be17a3f51
commit fac1eea159
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
extensions/simple-browser/src/simpleBrowserView.ts
View file

@ -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>());
@ -31,12 +45,8 @@ 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);
}
@ -44,9 +54,9 @@ export class SimpleBrowserView extends Disposable {
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(
@ -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) {
@ -171,7 +182,6 @@ function escapeAttribute(value: string | vscode.Uri): string {
return value.toString().replace(/"/g, '&quot;');
}
function getNonce() {
let text = '';
const possible = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';