Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
旅途_2012
vscode
提交
54fd81db
V
vscode
项目概览
旅途_2012
/
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,发现更多精彩内容 >>
提交
54fd81db
编写于
7月 06, 2018
作者:
R
Rachel Macfarlane
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Don't show participants label for new comments
上级
c75c5c1f
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
38 addition
and
49 deletion
+38
-49
src/vs/workbench/parts/comments/electron-browser/commentThreadWidget.ts
...ch/parts/comments/electron-browser/commentThreadWidget.ts
+38
-49
未找到文件。
src/vs/workbench/parts/comments/electron-browser/commentThreadWidget.ts
浏览文件 @
54fd81db
...
...
@@ -108,7 +108,6 @@ export class ReviewZoneWidget extends ZoneWidget {
private
_commentThread
:
modes
.
CommentThread
;
private
_commentGlyph
:
CommentGlyphWidget
;
private
_owner
:
number
;
private
_decorationIDs
:
string
[];
private
_localToDispose
:
IDisposable
[];
public
get
owner
():
number
{
...
...
@@ -134,7 +133,6 @@ export class ReviewZoneWidget extends ZoneWidget {
this
.
_owner
=
owner
;
this
.
_commentThread
=
commentThread
;
this
.
_isCollapsed
=
commentThread
.
collapsibleState
!==
modes
.
CommentThreadCollapsibleState
.
Expanded
;
this
.
_decorationIDs
=
[];
this
.
_localToDispose
=
[];
this
.
create
();
this
.
themeService
.
onThemeChange
(
this
.
_applyTheme
,
this
);
...
...
@@ -150,12 +148,7 @@ export class ReviewZoneWidget extends ZoneWidget {
public
reveal
(
commentId
?:
string
)
{
if
(
this
.
_isCollapsed
)
{
if
(
this
.
_decorationIDs
&&
this
.
_decorationIDs
.
length
)
{
let
range
=
this
.
editor
.
getModel
().
getDecorationRange
(
this
.
_decorationIDs
[
0
]);
this
.
show
(
range
,
2
);
}
else
{
this
.
show
({
lineNumber
:
this
.
_commentThread
.
range
.
startLineNumber
,
column
:
1
},
2
);
}
this
.
show
({
lineNumber
:
this
.
_commentThread
.
range
.
startLineNumber
,
column
:
1
},
2
);
}
this
.
_bodyElement
.
focus
();
...
...
@@ -195,13 +188,9 @@ export class ReviewZoneWidget extends ZoneWidget {
this
.
_secondaryHeading
=
$
(
'
span.dirname
'
).
appendTo
(
titleElement
).
getHTMLElement
();
this
.
_metaHeading
=
$
(
'
span.meta
'
).
appendTo
(
titleElement
).
getHTMLElement
();
let
primaryHeading
=
'
Participants:
'
;
$
(
this
.
_primaryHeading
).
safeInnerHtml
(
primaryHeading
);
this
.
_primaryHeading
.
setAttribute
(
'
aria-label
'
,
primaryHeading
);
let
secondaryHeading
=
this
.
_commentThread
.
comments
.
filter
(
arrays
.
uniqueFilter
(
comment
=>
comment
.
userName
)).
map
(
comment
=>
`@
${
comment
.
userName
}
`
).
join
(
'
,
'
);
$
(
this
.
_secondaryHeading
).
safeInnerHtml
(
secondaryHeading
);
this
.
_secondaryHeading
.
setAttribute
(
'
aria-label
'
,
secondaryHeading
);
if
(
this
.
_commentThread
.
comments
.
length
)
{
this
.
createParticipantsLabel
();
}
const
actionsContainer
=
$
(
'
.review-actions
'
).
appendTo
(
this
.
_headElement
);
this
.
_actionbarWidget
=
new
ActionBar
(
actionsContainer
.
getHTMLElement
(),
{});
...
...
@@ -253,16 +242,6 @@ export class ReviewZoneWidget extends ZoneWidget {
this
.
_commentsElement
.
removeChild
(
commentElementsToDel
[
i
].
domNode
);
}
if
(
this
.
_commentElements
.
length
===
0
)
{
this
.
_commentThread
=
commentThread
;
commentThread
.
comments
.
forEach
(
comment
=>
{
let
newElement
=
new
CommentNode
(
comment
);
this
.
_commentElements
.
push
(
newElement
);
this
.
_commentsElement
.
appendChild
(
newElement
.
domNode
);
});
return
;
}
let
lastCommentElement
:
HTMLElement
=
null
;
let
newCommentNodeList
:
CommentNode
[]
=
[];
for
(
let
i
=
newCommentsLen
-
1
;
i
>=
0
;
i
--
)
{
...
...
@@ -349,7 +328,15 @@ export class ReviewZoneWidget extends ZoneWidget {
this
.
setCommentEditorDecorations
();
// Only add the additional step of clicking a reply button to expand the textarea when there are existing comments
this
.
createReplyButton
();
if
(
hasExistingComments
)
{
this
.
createReplyButton
();
}
else
{
if
(
!
dom
.
hasClass
(
this
.
_commentForm
,
'
expand
'
))
{
dom
.
addClass
(
this
.
_commentForm
,
'
expand
'
);
this
.
_commentEditor
.
focus
();
}
}
this
.
_localToDispose
.
push
(
this
.
_commentEditor
.
onKeyDown
((
ev
:
IKeyboardEvent
)
=>
{
const
hasExistingComments
=
this
.
_commentThread
.
comments
.
length
>
0
;
...
...
@@ -385,6 +372,7 @@ export class ReviewZoneWidget extends ZoneWidget {
);
this
.
createReplyButton
();
this
.
createParticipantsLabel
();
}
this
.
_commentEditor
.
setValue
(
''
);
...
...
@@ -416,31 +404,33 @@ export class ReviewZoneWidget extends ZoneWidget {
}
}
createReplyButton
()
{
const
hasExistingComments
=
this
.
_commentThread
.
comments
.
length
>
0
;
if
(
hasExistingComments
)
{
this
.
_reviewThreadReplyButton
=
<
HTMLButtonElement
>
$
(
'
button.review-thread-reply-button
'
).
appendTo
(
this
.
_commentForm
).
getHTMLElement
();
this
.
_reviewThreadReplyButton
.
title
=
'
Reply...
'
;
this
.
_reviewThreadReplyButton
.
textContent
=
'
Reply...
'
;
// bind click/escape actions for reviewThreadReplyButton and textArea
this
.
_reviewThreadReplyButton
.
onclick
=
()
=>
{
if
(
!
dom
.
hasClass
(
this
.
_commentForm
,
'
expand
'
))
{
dom
.
addClass
(
this
.
_commentForm
,
'
expand
'
);
this
.
_commentEditor
.
focus
();
}
};
createParticipantsLabel
()
{
const
primaryHeading
=
'
Participants:
'
;
$
(
this
.
_primaryHeading
).
safeInnerHtml
(
primaryHeading
);
this
.
_primaryHeading
.
setAttribute
(
'
aria-label
'
,
primaryHeading
);
this
.
_commentEditor
.
onDidBlurEditorWidget
(()
=>
{
if
(
this
.
_commentEditor
.
getModel
().
getValueLength
()
===
0
&&
dom
.
hasClass
(
this
.
_commentForm
,
'
expand
'
))
{
dom
.
removeClass
(
this
.
_commentForm
,
'
expand
'
);
}
});
}
else
{
const
secondaryHeading
=
this
.
_commentThread
.
comments
.
filter
(
arrays
.
uniqueFilter
(
comment
=>
comment
.
userName
)).
map
(
comment
=>
`@
${
comment
.
userName
}
`
).
join
(
'
,
'
);
$
(
this
.
_secondaryHeading
).
safeInnerHtml
(
secondaryHeading
);
this
.
_secondaryHeading
.
setAttribute
(
'
aria-label
'
,
secondaryHeading
);
}
createReplyButton
()
{
this
.
_reviewThreadReplyButton
=
<
HTMLButtonElement
>
$
(
'
button.review-thread-reply-button
'
).
appendTo
(
this
.
_commentForm
).
getHTMLElement
();
this
.
_reviewThreadReplyButton
.
title
=
'
Reply...
'
;
this
.
_reviewThreadReplyButton
.
textContent
=
'
Reply...
'
;
// bind click/escape actions for reviewThreadReplyButton and textArea
this
.
_reviewThreadReplyButton
.
onclick
=
()
=>
{
if
(
!
dom
.
hasClass
(
this
.
_commentForm
,
'
expand
'
))
{
dom
.
addClass
(
this
.
_commentForm
,
'
expand
'
);
this
.
_commentEditor
.
focus
();
}
}
};
this
.
_commentEditor
.
onDidBlurEditorWidget
(()
=>
{
if
(
this
.
_commentEditor
.
getModel
().
getValueLength
()
===
0
&&
dom
.
hasClass
(
this
.
_commentForm
,
'
expand
'
))
{
dom
.
removeClass
(
this
.
_commentForm
,
'
expand
'
);
}
});
}
_refresh
()
{
...
...
@@ -561,13 +551,12 @@ export class ReviewZoneWidget extends ZoneWidget {
this
.
_resizeObserver
.
disconnect
();
this
.
_resizeObserver
=
null
;
}
this
.
editor
.
changeDecorations
(
accessor
=>
{
accessor
.
deltaDecorations
(
this
.
_decorationIDs
,
[]);
});
if
(
this
.
_commentGlyph
)
{
this
.
editor
.
removeContentWidget
(
this
.
_commentGlyph
);
this
.
_commentGlyph
=
null
;
}
this
.
_localToDispose
.
forEach
(
local
=>
local
.
dispose
());
this
.
_onDidClose
.
fire
();
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录