Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
044be085
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,发现更多精彩内容 >>
提交
044be085
编写于
2月 07, 2018
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
File label creates description DOM nodes even if description is empty (fixes #40208)
上级
89cbaa99
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
31 addition
and
19 deletion
+31
-19
src/vs/base/browser/ui/iconLabel/iconLabel.ts
src/vs/base/browser/ui/iconLabel/iconLabel.ts
+31
-19
未找到文件。
src/vs/base/browser/ui/iconLabel/iconLabel.ts
浏览文件 @
044be085
...
...
@@ -65,7 +65,11 @@ class FastLabelNode {
}
this
.
_title
=
title
;
this
.
_element
.
title
=
title
;
if
(
this
.
_title
)
{
this
.
_element
.
title
=
title
;
}
else
{
this
.
_element
.
removeAttribute
(
'
title
'
);
}
}
public
set
empty
(
empty
:
boolean
)
{
...
...
@@ -84,24 +88,26 @@ class FastLabelNode {
export
class
IconLabel
{
private
domNode
:
FastLabelNode
;
private
labelDescriptionContainer
:
FastLabelNode
;
private
labelNode
:
FastLabelNode
|
HighlightedLabel
;
private
descriptionNode
:
FastLabelNode
|
HighlightedLabel
;
private
descriptionNodeFactory
:
()
=>
FastLabelNode
|
HighlightedLabel
;
constructor
(
container
:
HTMLElement
,
options
?:
IIconLabelCreationOptions
)
{
this
.
domNode
=
new
FastLabelNode
(
dom
.
append
(
container
,
dom
.
$
(
'
.monaco-icon-label
'
)));
const
labelDescriptionContainer
=
new
FastLabelNode
(
dom
.
append
(
this
.
domNode
.
element
,
dom
.
$
(
'
.monaco-icon-label-description-container
'
)));
this
.
labelDescriptionContainer
=
new
FastLabelNode
(
dom
.
append
(
this
.
domNode
.
element
,
dom
.
$
(
'
.monaco-icon-label-description-container
'
)));
if
(
options
&&
options
.
supportHighlights
)
{
this
.
labelNode
=
new
HighlightedLabel
(
dom
.
append
(
labelDescriptionContainer
.
element
,
dom
.
$
(
'
a.label-name
'
)));
this
.
labelNode
=
new
HighlightedLabel
(
dom
.
append
(
this
.
labelDescriptionContainer
.
element
,
dom
.
$
(
'
a.label-name
'
)));
}
else
{
this
.
labelNode
=
new
FastLabelNode
(
dom
.
append
(
labelDescriptionContainer
.
element
,
dom
.
$
(
'
a.label-name
'
)));
this
.
labelNode
=
new
FastLabelNode
(
dom
.
append
(
this
.
labelDescriptionContainer
.
element
,
dom
.
$
(
'
a.label-name
'
)));
}
if
(
options
&&
options
.
supportDescriptionHighlights
)
{
this
.
descriptionNode
=
new
HighlightedLabel
(
dom
.
append
(
labelDescriptionContainer
.
element
,
dom
.
$
(
'
span.label-description
'
)));
this
.
descriptionNode
Factory
=
()
=>
new
HighlightedLabel
(
dom
.
append
(
this
.
labelDescriptionContainer
.
element
,
dom
.
$
(
'
span.label-description
'
)));
}
else
{
this
.
descriptionNode
=
new
FastLabelNode
(
dom
.
append
(
labelDescriptionContainer
.
element
,
dom
.
$
(
'
span.label-description
'
)));
this
.
descriptionNode
Factory
=
()
=>
new
FastLabelNode
(
dom
.
append
(
this
.
labelDescriptionContainer
.
element
,
dom
.
$
(
'
span.label-description
'
)));
}
}
...
...
@@ -111,8 +117,7 @@ export class IconLabel {
public
onClick
(
callback
:
(
event
:
MouseEvent
)
=>
void
):
IDisposable
{
return
combinedDisposable
([
dom
.
addDisposableListener
(
this
.
labelNode
.
element
,
dom
.
EventType
.
CLICK
,
(
e
:
MouseEvent
)
=>
callback
(
e
)),
dom
.
addDisposableListener
(
this
.
descriptionNode
.
element
,
dom
.
EventType
.
CLICK
,
(
e
:
MouseEvent
)
=>
callback
(
e
))
dom
.
addDisposableListener
(
this
.
labelDescriptionContainer
.
element
,
dom
.
EventType
.
CLICK
,
(
e
:
MouseEvent
)
=>
callback
(
e
)),
]);
}
...
...
@@ -131,26 +136,33 @@ export class IconLabel {
this
.
domNode
.
className
=
classes
.
join
(
'
'
);
this
.
domNode
.
title
=
options
&&
options
.
title
?
options
.
title
:
''
;
const
labelNode
=
this
.
labelNode
;
if
(
labelNode
instanceof
HighlightedLabel
)
{
labelNode
.
set
(
label
||
''
,
options
?
options
.
matches
:
void
0
);
if
(
this
.
labelNode
instanceof
HighlightedLabel
)
{
this
.
labelNode
.
set
(
label
||
''
,
options
?
options
.
matches
:
void
0
);
}
else
{
labelNode
.
textContent
=
label
||
''
;
this
.
labelNode
.
textContent
=
label
||
''
;
}
const
descriptionNode
=
this
.
descriptionNode
;
if
(
descriptionNode
instanceof
HighlightedLabel
)
{
descriptionNode
.
set
(
description
||
''
,
options
?
options
.
descriptionMatches
:
void
0
);
}
else
{
descriptionNode
.
textContent
=
description
||
''
;
descriptionNode
.
empty
=
!
description
;
if
(
description
||
this
.
descriptionNode
)
{
if
(
!
this
.
descriptionNode
)
{
this
.
descriptionNode
=
this
.
descriptionNodeFactory
();
// description node is created lazily on demand
}
if
(
this
.
descriptionNode
instanceof
HighlightedLabel
)
{
this
.
descriptionNode
.
set
(
description
||
''
,
options
?
options
.
descriptionMatches
:
void
0
);
}
else
{
this
.
descriptionNode
.
textContent
=
description
||
''
;
this
.
descriptionNode
.
empty
=
!
description
;
}
}
}
public
dispose
():
void
{
this
.
domNode
.
dispose
();
this
.
labelNode
.
dispose
();
this
.
descriptionNode
.
dispose
();
if
(
this
.
descriptionNode
)
{
this
.
descriptionNode
.
dispose
();
}
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录