From c67bdcdaed60e411fe5642c83246eca219c5974c Mon Sep 17 00:00:00 2001 From: chriswang521 Date: Fri, 7 Apr 2023 09:47:59 +0800 Subject: [PATCH] =?UTF-8?q?Fixed=20webviews=20are=20broken=20on=20Firefox?= =?UTF-8?q?=20from=20upstream=201.68=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .npmrc | 3 +++ extensions/vscode-language-pack-zh-hans/yarn.lock | 4 ++++ src/vs/platform/dialogs/electron-main/dialogMainService.ts | 3 ++- src/vs/workbench/browser/parts/views/treeView.ts | 2 +- .../workbench/contrib/webview/browser/pre/index-no-csp.html | 2 ++ 5 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 .npmrc create mode 100644 extensions/vscode-language-pack-zh-hans/yarn.lock diff --git a/.npmrc b/.npmrc new file mode 100644 index 00000000..68449bbe --- /dev/null +++ b/.npmrc @@ -0,0 +1,3 @@ +sass_binary_site=https://npm.taobao.org/mirrors/node-sass/ +registry=https://registry.npm.taobao.org +electron_mirror=https://npm.taobao.org/mirrors/electron/ diff --git a/extensions/vscode-language-pack-zh-hans/yarn.lock b/extensions/vscode-language-pack-zh-hans/yarn.lock new file mode 100644 index 00000000..fb57ccd1 --- /dev/null +++ b/extensions/vscode-language-pack-zh-hans/yarn.lock @@ -0,0 +1,4 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + diff --git a/src/vs/platform/dialogs/electron-main/dialogMainService.ts b/src/vs/platform/dialogs/electron-main/dialogMainService.ts index 6bc6ec77..126b87c2 100644 --- a/src/vs/platform/dialogs/electron-main/dialogMainService.ts +++ b/src/vs/platform/dialogs/electron-main/dialogMainService.ts @@ -82,7 +82,8 @@ export class DialogMainService implements IDialogMainService { const dialogOptions: OpenDialogOptions = { title: options.title, buttonLabel: options.buttonLabel, - filters: options.filters + filters: options.filters, + defaultPath: options.defaultPath }; // Ensure properties diff --git a/src/vs/workbench/browser/parts/views/treeView.ts b/src/vs/workbench/browser/parts/views/treeView.ts index 0912c741..53c32eab 100644 --- a/src/vs/workbench/browser/parts/views/treeView.ts +++ b/src/vs/workbench/browser/parts/views/treeView.ts @@ -1084,7 +1084,7 @@ class TreeRenderer extends Disposable implements ITreeRenderer + +