Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
c2b17260
V
vscode
项目概览
掘金者说
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
c2b17260
编写于
11月 30, 2018
作者:
M
Matt Bierner
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Strict null check action bar
上级
4bb81b60
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
38 addition
and
24 deletion
+38
-24
src/tsconfig.strictNullChecks.json
src/tsconfig.strictNullChecks.json
+1
-0
src/vs/base/browser/ui/actionbar/actionbar.ts
src/vs/base/browser/ui/actionbar/actionbar.ts
+37
-24
未找到文件。
src/tsconfig.strictNullChecks.json
浏览文件 @
c2b17260
...
...
@@ -22,6 +22,7 @@
"./vs/base/browser/keyboardEvent.ts"
,
"./vs/base/browser/mouseEvent.ts"
,
"./vs/base/browser/touch.ts"
,
"./vs/base/browser/ui/actionbar/actionbar.ts"
,
"./vs/base/browser/ui/aria/aria.ts"
,
"./vs/base/browser/ui/breadcrumbs/breadcrumbsWidget.ts"
,
"./vs/base/browser/ui/button/button.ts"
,
...
...
src/vs/base/browser/ui/actionbar/actionbar.ts
浏览文件 @
c2b17260
...
...
@@ -18,7 +18,7 @@ import { IContextViewProvider } from 'vs/base/browser/ui/contextview/contextview
import
{
Event
,
Emitter
}
from
'
vs/base/common/event
'
;
export
interface
IActionItem
{
actionRunner
:
IActionRunner
;
actionRunner
?
:
IActionRunner
;
setActionContext
(
context
:
any
):
void
;
render
(
element
:
HTMLElement
):
void
;
isEnabled
():
boolean
;
...
...
@@ -34,7 +34,7 @@ export interface IBaseActionItemOptions {
export
class
BaseActionItem
extends
Disposable
implements
IActionItem
{
element
:
HTMLElement
;
element
?
:
HTMLElement
;
_context
:
any
;
_action
:
IAction
;
...
...
@@ -118,7 +118,7 @@ export class BaseActionItem extends Disposable implements IActionItem {
DOM
.
EventHelper
.
stop
(
e
,
true
);
// do not run when dragging is on because that would disable it
}
if
(
this
.
_action
.
enabled
&&
e
.
button
===
0
)
{
if
(
this
.
_action
.
enabled
&&
e
.
button
===
0
&&
this
.
element
)
{
DOM
.
addClass
(
this
.
element
,
'
active
'
);
}
}));
...
...
@@ -145,9 +145,9 @@ export class BaseActionItem extends Disposable implements IActionItem {
}));
[
DOM
.
EventType
.
MOUSE_UP
,
DOM
.
EventType
.
MOUSE_OUT
].
forEach
(
event
=>
{
this
.
_register
(
DOM
.
addDisposableListener
(
this
.
element
,
event
,
e
=>
{
this
.
_register
(
DOM
.
addDisposableListener
(
this
.
element
!
,
event
,
e
=>
{
DOM
.
EventHelper
.
stop
(
e
);
DOM
.
removeClass
(
this
.
element
,
'
active
'
);
DOM
.
removeClass
(
this
.
element
!
,
'
active
'
);
}));
});
}
...
...
@@ -206,7 +206,7 @@ export class BaseActionItem extends Disposable implements IActionItem {
dispose
():
void
{
if
(
this
.
element
)
{
DOM
.
removeNode
(
this
.
element
);
this
.
element
=
null
;
this
.
element
=
undefined
;
}
super
.
dispose
();
...
...
@@ -236,7 +236,7 @@ export class ActionItem extends BaseActionItem {
protected
label
:
HTMLElement
;
protected
options
:
IActionItemOptions
;
private
cssClass
:
string
;
private
cssClass
?
:
string
;
constructor
(
context
:
any
,
action
:
IAction
,
options
:
IActionItemOptions
=
{})
{
super
(
context
,
action
,
options
);
...
...
@@ -250,7 +250,9 @@ export class ActionItem extends BaseActionItem {
render
(
container
:
HTMLElement
):
void
{
super
.
render
(
container
);
this
.
label
=
DOM
.
append
(
this
.
element
,
DOM
.
$
(
'
a.action-label
'
));
if
(
this
.
element
)
{
this
.
label
=
DOM
.
append
(
this
.
element
,
DOM
.
$
(
'
a.action-label
'
));
}
if
(
this
.
_action
.
id
===
Separator
.
ID
)
{
this
.
label
.
setAttribute
(
'
role
'
,
'
presentation
'
);
// A separator is a presentation item
}
else
{
...
...
@@ -261,7 +263,7 @@ export class ActionItem extends BaseActionItem {
}
}
if
(
this
.
options
.
label
&&
this
.
options
.
keybinding
)
{
if
(
this
.
options
.
label
&&
this
.
options
.
keybinding
&&
this
.
element
)
{
DOM
.
append
(
this
.
element
,
DOM
.
$
(
'
span.keybinding
'
)).
textContent
=
this
.
options
.
keybinding
;
}
...
...
@@ -324,12 +326,16 @@ export class ActionItem extends BaseActionItem {
updateEnabled
():
void
{
if
(
this
.
getAction
().
enabled
)
{
this
.
label
.
removeAttribute
(
'
aria-disabled
'
);
DOM
.
removeClass
(
this
.
element
,
'
disabled
'
);
if
(
this
.
element
)
{
DOM
.
removeClass
(
this
.
element
,
'
disabled
'
);
}
DOM
.
removeClass
(
this
.
label
,
'
disabled
'
);
this
.
label
.
tabIndex
=
0
;
}
else
{
this
.
label
.
setAttribute
(
'
aria-disabled
'
,
'
true
'
);
DOM
.
addClass
(
this
.
element
,
'
disabled
'
);
if
(
this
.
element
)
{
DOM
.
addClass
(
this
.
element
,
'
disabled
'
);
}
DOM
.
addClass
(
this
.
label
,
'
disabled
'
);
DOM
.
removeTabIndexAndUpdateFocus
(
this
.
label
);
}
...
...
@@ -387,12 +393,12 @@ export class ActionBar extends Disposable implements IActionRunner {
options
:
IActionBarOptions
;
private
_actionRunner
:
IActionRunner
;
private
_actionRunner
?
:
IActionRunner
;
private
_context
:
any
;
// Items
items
:
IActionItem
[];
protected
focusedItem
:
number
;
protected
focusedItem
?
:
number
;
private
focusTracker
:
DOM
.
IFocusTracker
;
// Elements
...
...
@@ -495,7 +501,7 @@ export class ActionBar extends Disposable implements IActionRunner {
// Run action on Enter/Space
if
(
this
.
isTriggerKeyEvent
(
event
))
{
if
(
!
this
.
options
.
triggerKeys
.
keyDown
)
{
if
(
this
.
options
.
triggerKeys
&&
!
this
.
options
.
triggerKeys
.
keyDown
)
{
this
.
doTrigger
(
event
);
}
...
...
@@ -570,11 +576,11 @@ export class ActionBar extends Disposable implements IActionRunner {
this
.
items
.
forEach
(
i
=>
i
.
setActionContext
(
context
));
}
get
actionRunner
():
IActionRunner
{
get
actionRunner
():
IActionRunner
|
undefined
{
return
this
.
_actionRunner
;
}
set
actionRunner
(
actionRunner
:
IActionRunner
)
{
set
actionRunner
(
actionRunner
:
IActionRunner
|
undefined
)
{
if
(
actionRunner
)
{
this
.
_actionRunner
=
actionRunner
;
this
.
items
.
forEach
(
item
=>
item
.
actionRunner
=
actionRunner
);
...
...
@@ -628,7 +634,10 @@ export class ActionBar extends Disposable implements IActionRunner {
getWidth
(
index
:
number
):
number
{
if
(
index
>=
0
&&
index
<
this
.
actionsList
.
children
.
length
)
{
return
this
.
actionsList
.
children
.
item
(
index
).
clientWidth
;
const
item
=
this
.
actionsList
.
children
.
item
(
index
);
if
(
item
)
{
return
item
.
clientWidth
;
}
}
return
0
;
...
...
@@ -636,7 +645,10 @@ export class ActionBar extends Disposable implements IActionRunner {
getHeight
(
index
:
number
):
number
{
if
(
index
>=
0
&&
index
<
this
.
actionsList
.
children
.
length
)
{
return
this
.
actionsList
.
children
.
item
(
index
).
clientHeight
;
const
item
=
this
.
actionsList
.
children
.
item
(
index
);
if
(
item
)
{
return
item
.
clientHeight
;
}
}
return
0
;
...
...
@@ -765,14 +777,15 @@ export class ActionBar extends Disposable implements IActionRunner {
}
run
(
action
:
IAction
,
context
?:
any
):
Thenable
<
void
>
{
return
this
.
_actionRunner
.
run
(
action
,
context
);
if
(
this
.
_actionRunner
)
{
return
this
.
_actionRunner
.
run
(
action
,
context
);
}
return
Promise
.
resolve
(
void
0
);
}
dispose
():
void
{
if
(
this
.
items
!==
null
)
{
dispose
(
this
.
items
);
}
this
.
items
=
null
;
dispose
(
this
.
items
);
this
.
items
=
[];
DOM
.
removeNode
(
this
.
getContainer
());
...
...
@@ -786,7 +799,7 @@ export class SelectActionItem extends BaseActionItem {
constructor
(
ctx
:
any
,
action
:
IAction
,
options
:
string
[],
selected
:
number
,
contextViewProvider
:
IContextViewProvider
,
selectBoxOptions
?:
ISelectBoxOptions
)
{
super
(
ctx
,
action
);
this
.
selectBox
=
new
SelectBox
(
options
,
selected
,
contextViewProvider
,
null
,
selectBoxOptions
);
this
.
selectBox
=
new
SelectBox
(
options
,
selected
,
contextViewProvider
,
undefined
,
selectBoxOptions
);
this
.
_register
(
this
.
selectBox
);
this
.
registerListeners
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录