Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
f734680a
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,发现更多精彩内容 >>
提交
f734680a
编写于
1月 17, 2017
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
migrate showActivity call
上级
f2be74a6
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
12 addition
and
6 deletion
+12
-6
src/vs/workbench/parts/scm/browser/scmActivity.ts
src/vs/workbench/parts/scm/browser/scmActivity.ts
+10
-3
src/vs/workbench/parts/scm/browser/scmViewlet.ts
src/vs/workbench/parts/scm/browser/scmViewlet.ts
+2
-3
未找到文件。
src/vs/workbench/parts/scm/browser/scmActivity.ts
浏览文件 @
f734680a
...
...
@@ -6,7 +6,7 @@
'
use strict
'
;
import
{
localize
}
from
'
vs/nls
'
;
import
{
IDisposable
,
dispose
,
empty
as
EmptyDisposable
}
from
'
vs/base/common/lifecycle
'
;
import
{
IDisposable
,
dispose
,
empty
as
EmptyDisposable
,
OneDisposable
}
from
'
vs/base/common/lifecycle
'
;
import
{
VIEWLET_ID
}
from
'
vs/workbench/parts/scm/common/scm
'
;
import
{
ISCMService
,
ISCMProvider
}
from
'
vs/workbench/services/scm/common/scm
'
;
import
{
IActivityBarService
,
NumberBadge
}
from
'
vs/workbench/services/activity/common/activityBarService
'
;
...
...
@@ -17,6 +17,7 @@ export class StatusUpdater implements IWorkbenchContribution {
static
ID
=
'
vs.scm.statusUpdater
'
;
private
providerChangeDisposable
:
IDisposable
=
EmptyDisposable
;
private
badgeHandle
=
new
OneDisposable
();
private
disposables
:
IDisposable
[]
=
[];
constructor
(
...
...
@@ -25,6 +26,7 @@ export class StatusUpdater implements IWorkbenchContribution {
)
{
this
.
scmService
.
onDidChangeProvider
(
this
.
setActiveProvider
,
this
,
this
.
disposables
);
this
.
setActiveProvider
(
this
.
scmService
.
activeProvider
);
this
.
disposables
.
push
(
this
.
badgeHandle
);
}
getId
():
string
{
...
...
@@ -40,9 +42,14 @@ export class StatusUpdater implements IWorkbenchContribution {
private
update
():
void
{
const
provider
=
this
.
scmService
.
activeProvider
;
const
count
=
provider
?
provider
.
resources
.
reduce
<
number
>
((
r
,
g
)
=>
r
+
g
.
resources
.
length
,
0
)
:
0
;
const
badge
=
count
>
0
?
new
NumberBadge
(
count
,
num
=>
localize
(
'
scmPendingChangesBadge
'
,
'
{0} pending changes
'
,
num
))
:
null
;
this
.
activityBarService
.
showActivity
(
VIEWLET_ID
,
badge
,
'
scm-viewlet-label
'
);
if
(
count
>
0
)
{
const
badge
=
new
NumberBadge
(
count
,
num
=>
localize
(
'
scmPendingChangesBadge
'
,
'
{0} pending changes
'
,
num
));
this
.
badgeHandle
.
value
=
this
.
activityBarService
.
showActivity
(
VIEWLET_ID
,
badge
,
'
scm-viewlet-label
'
);
}
else
{
this
.
badgeHandle
.
value
=
null
;
}
}
dispose
():
void
{
...
...
src/vs/workbench/parts/scm/browser/scmViewlet.ts
浏览文件 @
f734680a
...
...
@@ -12,7 +12,7 @@ import { TPromise } from 'vs/base/common/winjs.base';
import
{
chain
}
from
'
vs/base/common/event
'
;
import
{
Throttler
}
from
'
vs/base/common/async
'
;
import
{
domEvent
}
from
'
vs/base/browser/event
'
;
import
{
IDisposable
,
dispose
,
empty
as
EmptyDisposable
,
OneDisposable
}
from
'
vs/base/common/lifecycle
'
;
import
{
IDisposable
,
dispose
,
empty
as
EmptyDisposable
}
from
'
vs/base/common/lifecycle
'
;
import
{
Builder
,
Dimension
}
from
'
vs/base/browser/builder
'
;
import
{
Viewlet
}
from
'
vs/workbench/browser/viewlet
'
;
import
{
append
,
$
,
toggleClass
}
from
'
vs/base/browser/dom
'
;
...
...
@@ -156,7 +156,6 @@ export class SCMViewlet extends Viewlet {
private
list
:
List
<
ISCMResourceGroup
|
ISCMResource
>
;
private
menus
:
SCMMenus
;
private
providerChangeDisposable
:
IDisposable
=
EmptyDisposable
;
private
badgeHandle
=
new
OneDisposable
();
private
disposables
:
IDisposable
[]
=
[];
constructor
(
...
...
@@ -174,7 +173,7 @@ export class SCMViewlet extends Viewlet {
super
(
VIEWLET_ID
,
telemetryService
);
this
.
menus
=
this
.
instantiationService
.
createInstance
(
SCMMenus
);
this
.
disposables
.
push
(
this
.
menus
,
this
.
badgeHandle
);
this
.
disposables
.
push
(
this
.
menus
);
}
private
setActiveProvider
(
activeProvider
:
ISCMProvider
|
undefined
):
void
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录