From 2f56107185e0e2fc5d68580a48febed58c57f664 Mon Sep 17 00:00:00 2001 From: chriswang521 Date: Fri, 7 Apr 2023 09:49:59 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"Fixed=20webviews=20are=20broken=20on?= =?UTF-8?q?=20Firefox=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 This reverts commit c67bdcdaed60e411fe5642c83246eca219c5974c. --- .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, 2 insertions(+), 12 deletions(-) delete mode 100644 .npmrc delete mode 100644 extensions/vscode-language-pack-zh-hans/yarn.lock diff --git a/.npmrc b/.npmrc deleted file mode 100644 index 68449bbe..00000000 --- a/.npmrc +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index fb57ccd1..00000000 --- a/extensions/vscode-language-pack-zh-hans/yarn.lock +++ /dev/null @@ -1,4 +0,0 @@ -# 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 126b87c2..6bc6ec77 100644 --- a/src/vs/platform/dialogs/electron-main/dialogMainService.ts +++ b/src/vs/platform/dialogs/electron-main/dialogMainService.ts @@ -82,8 +82,7 @@ export class DialogMainService implements IDialogMainService { const dialogOptions: OpenDialogOptions = { title: options.title, buttonLabel: options.buttonLabel, - filters: options.filters, - defaultPath: options.defaultPath + filters: options.filters }; // Ensure properties diff --git a/src/vs/workbench/browser/parts/views/treeView.ts b/src/vs/workbench/browser/parts/views/treeView.ts index 53c32eab..0912c741 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 - -