Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
ddab4d65
V
vscode
项目概览
xxadev
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
ddab4d65
编写于
3月 06, 2018
作者:
M
Matt Bierner
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Don't take parent in webview ctor
上级
bb1f0f04
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
13 addition
and
10 deletion
+13
-10
src/vs/workbench/parts/extensions/browser/extensionEditor.ts
src/vs/workbench/parts/extensions/browser/extensionEditor.ts
+2
-1
src/vs/workbench/parts/html/browser/htmlPreviewPart.ts
src/vs/workbench/parts/html/browser/htmlPreviewPart.ts
+1
-1
src/vs/workbench/parts/html/browser/webview.ts
src/vs/workbench/parts/html/browser/webview.ts
+9
-7
src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts
...workbench/parts/webview/electron-browser/webviewEditor.ts
+1
-1
未找到文件。
src/vs/workbench/parts/extensions/browser/extensionEditor.ts
浏览文件 @
ddab4d65
...
...
@@ -426,7 +426,8 @@ export class ExtensionEditor extends BaseEditor {
.
then
<
void
>
(
body
=>
{
const
allowedBadgeProviders
=
this
.
extensionsWorkbenchService
.
allowedBadgeProviders
;
const
webViewOptions
=
allowedBadgeProviders
.
length
>
0
?
{
allowScripts
:
false
,
allowSvgs
:
false
,
svgWhiteList
:
allowedBadgeProviders
}
:
{};
this
.
activeWebview
=
new
Webview
(
this
.
content
,
this
.
partService
.
getContainer
(
Parts
.
EDITOR_PART
),
this
.
themeService
,
this
.
environmentService
,
this
.
contextViewService
,
this
.
contextKey
,
this
.
findInputFocusContextKey
,
webViewOptions
);
this
.
activeWebview
=
new
Webview
(
this
.
partService
.
getContainer
(
Parts
.
EDITOR_PART
),
this
.
themeService
,
this
.
environmentService
,
this
.
contextViewService
,
this
.
contextKey
,
this
.
findInputFocusContextKey
,
webViewOptions
);
this
.
activeWebview
.
mountTo
(
this
.
content
);
const
removeLayoutParticipant
=
arrays
.
insert
(
this
.
layoutParticipants
,
this
.
activeWebview
);
this
.
contentDisposables
.
push
(
toDisposable
(
removeLayoutParticipant
));
this
.
activeWebview
.
contents
=
body
;
...
...
src/vs/workbench/parts/html/browser/htmlPreviewPart.ts
浏览文件 @
ddab4d65
...
...
@@ -93,7 +93,6 @@ export class HtmlPreviewPart extends BaseWebviewEditor {
}
this
.
_webview
=
new
Webview
(
this
.
content
,
this
.
partService
.
getContainer
(
Parts
.
EDITOR_PART
),
this
.
themeService
,
this
.
_environmentService
,
...
...
@@ -104,6 +103,7 @@ export class HtmlPreviewPart extends BaseWebviewEditor {
...
webviewOptions
,
useSameOriginForRoot
:
true
});
this
.
_webview
.
mountTo
(
this
.
content
);
if
(
this
.
input
&&
this
.
input
instanceof
HtmlInput
)
{
const
state
=
this
.
loadViewState
(
this
.
input
.
getResource
());
...
...
src/vs/workbench/parts/html/browser/webview.ts
浏览文件 @
ddab4d65
...
...
@@ -37,7 +37,6 @@ export class Webview {
private
_contents
:
string
=
''
;
constructor
(
private
readonly
parent
:
HTMLElement
,
private
readonly
_styleElement
:
Element
,
private
readonly
_themeService
:
IThemeService
,
private
readonly
_environmentService
:
IEnvironmentService
,
...
...
@@ -180,11 +179,11 @@ export class Webview {
this
.
style
(
this
.
_themeService
.
getTheme
());
this
.
_themeService
.
onThemeChange
(
this
.
style
,
this
,
this
.
_disposables
);
}
if
(
parent
)
{
parent
.
appendChild
(
this
.
_webviewFindWidget
.
getDomNode
());
parent
.
appendChild
(
this
.
_webview
);
}
public
mountTo
(
parent
:
HTMLElement
)
{
parent
.
appendChild
(
this
.
_webviewFindWidget
.
getDomNode
());
parent
.
appendChild
(
this
.
_webview
);
}
public
notifyFindWidgetFocusChanged
(
isFocused
:
boolean
)
{
...
...
@@ -293,9 +292,12 @@ export class Webview {
}
contents
.
setZoomFactor
(
factor
);
if
(
!
this
.
_webview
||
!
this
.
_webview
.
parentElement
)
{
return
;
}
const
width
=
this
.
par
ent
.
clientWidth
;
const
height
=
this
.
par
ent
.
clientHeight
;
const
width
=
this
.
_webview
.
parentElem
ent
.
clientWidth
;
const
height
=
this
.
_webview
.
parentElem
ent
.
clientHeight
;
contents
.
setSize
({
normal
:
{
width
:
Math
.
floor
(
width
*
factor
),
...
...
src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts
浏览文件 @
ddab4d65
...
...
@@ -191,7 +191,6 @@ export class WebviewEditor extends BaseWebviewEditor {
this
.
findWidgetVisible
=
KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE
.
bindTo
(
this
.
_contextKeyService
);
this
.
_webview
=
new
Webview
(
this
.
webviewContent
,
this
.
_partService
.
getContainer
(
Parts
.
EDITOR_PART
),
this
.
themeService
,
this
.
_environmentService
,
...
...
@@ -202,6 +201,7 @@ export class WebviewEditor extends BaseWebviewEditor {
enableWrappedPostMessage
:
true
,
useSameOriginForRoot
:
false
});
this
.
_webview
.
mountTo
(
this
.
webviewContent
);
input
.
webview
=
this
.
_webview
;
if
(
input
.
options
.
tryRestoreScrollPosition
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录