p15693087
/
kylin-code
forked from openkylin/kylin-code
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed webviews are broken on Firefox from upstream 1.68版本

This commit is contained in:
chriswang521 2023-04-07 09:47:59 +08:00
parent 19f153de00
commit c67bdcdaed
5 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.npmrc Normal file
View File

@ -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/

4
extensions/vscode-language-pack-zh-hans/yarn.lock Normal file
View File

@ -0,0 +1,4 @@
# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
# yarn lockfile v1

3
src/vs/platform/dialogs/electron-main/dialogMainService.ts
View File

@ -82,7 +82,8 @@ export class DialogMainService implements IDialogMainService {
const dialogOptions: OpenDialogOptions = { const dialogOptions: OpenDialogOptions = {
title: options.title, title: options.title,
buttonLabel: options.buttonLabel, buttonLabel: options.buttonLabel,
filters: options.filters filters: options.filters,
defaultPath: options.defaultPath
}; };
// Ensure properties // Ensure properties

2
src/vs/workbench/browser/parts/views/treeView.ts
View File

@ -1084,7 +1084,7 @@ class TreeRenderer extends Disposable implements ITreeRenderer<ITreeItem, FuzzyS
private shouldHideResourceLabelIcon(iconUrl: URI | undefined, icon: ThemeIcon | undefined): boolean { private shouldHideResourceLabelIcon(iconUrl: URI | undefined, icon: ThemeIcon | undefined): boolean {
// We always hide the resource label in favor of the iconUrl when it's provided. // We always hide the resource label in favor of the iconUrl when it's provided.
// When `ThemeIcon` is provided, we hide the resource label icon in favor of it only if it's a not a file icon. // When `ThemeIcon` is provided, we hide the resource label icon in favor of it only if it's a not a file icon.
return !!iconUrl || !this.isFileKindThemeIcon(icon); return (!!iconUrl || (!!icon && !this.isFileKindThemeIcon(icon)));
} }
private shouldShowThemeIcon(hasResource: boolean, icon: ThemeIcon | undefined): icon is ThemeIcon { private shouldShowThemeIcon(hasResource: boolean, icon: ThemeIcon | undefined): icon is ThemeIcon {

2
src/vs/workbench/contrib/webview/browser/pre/index-no-csp.html
View File

@ -12,6 +12,8 @@
</head> </head>
<body style="margin: 0; overflow: hidden; width: 100%; height: 100%" role="document"> <body style="margin: 0; overflow: hidden; width: 100%; height: 100%" role="document">
<!-- TODO: Remove additional script tag once Firefox is fixed https://bugzilla.mozilla.org/show_bug.cgi?id=1737882 -->
<script></script>
<script async type="module"> <script async type="module">
// @ts-check // @ts-check
/// <reference lib="dom" /> /// <reference lib="dom" />