Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
289530a0
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
289530a0
编写于
7月 12, 2018
作者:
F
Filipa Lacerda
提交者:
Phil Hughes
7月 12, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Resolve "Improve performance of MR Changes tab: reduce event listeners on scroll event"
上级
eddf34f4
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
27 addition
and
84 deletion
+27
-84
app/assets/javascripts/diffs/components/app.vue
app/assets/javascripts/diffs/components/app.vue
+0
-16
app/assets/javascripts/diffs/components/changed_files.vue
app/assets/javascripts/diffs/components/changed_files.vue
+14
-27
app/assets/javascripts/diffs/components/changed_files_dropdown.vue
...s/javascripts/diffs/components/changed_files_dropdown.vue
+1
-1
app/assets/javascripts/diffs/components/diff_file.vue
app/assets/javascripts/diffs/components/diff_file.vue
+0
-37
app/assets/stylesheets/pages/diff.scss
app/assets/stylesheets/pages/diff.scss
+6
-0
changelogs/unreleased/48789-remove-event-listeners-scroll.yml
...gelogs/unreleased/48789-remove-event-listeners-scroll.yml
+6
-0
locale/gitlab.pot
locale/gitlab.pot
+0
-3
未找到文件。
app/assets/javascripts/diffs/components/app.vue
浏览文件 @
289530a0
...
...
@@ -41,11 +41,6 @@ export default {
required
:
true
,
},
},
data
()
{
return
{
activeFile
:
''
,
};
},
computed
:
{
...
mapState
({
isLoading
:
state
=>
state
.
diffs
.
isLoading
,
...
...
@@ -126,14 +121,6 @@ export default {
eventHub
.
$emit
(
'
fetchNotesData
'
);
}
},
setActive
(
filePath
)
{
this
.
activeFile
=
filePath
;
},
unsetActive
(
filePath
)
{
if
(
this
.
activeFile
===
filePath
)
{
this
.
activeFile
=
''
;
}
},
adjustView
()
{
if
(
this
.
shouldShow
&&
this
.
isParallelView
)
{
window
.
mrTabs
.
expandViewContainer
();
...
...
@@ -195,7 +182,6 @@ export default {
<changed-files
:diff-files=
"diffFiles"
:active-file=
"activeFile"
/>
<div
...
...
@@ -207,8 +193,6 @@ export default {
:key=
"file.newPath"
:file=
"file"
:current-user=
"currentUser"
@
setActive=
"setActive(file.filePath)"
@
unsetActive=
"unsetActive(file.filePath)"
/>
</div>
<no-changes
v-else
/>
...
...
app/assets/javascripts/diffs/components/changed_files.vue
浏览文件 @
289530a0
...
...
@@ -16,13 +16,6 @@ export default {
ClipboardButton
,
},
mixins
:
[
changedFilesMixin
],
props
:
{
activeFile
:
{
type
:
String
,
required
:
false
,
default
:
''
,
},
},
data
()
{
return
{
isStuck
:
false
,
...
...
@@ -70,7 +63,7 @@ export default {
pluralize
,
handleScroll
()
{
if
(
!
this
.
updating
)
{
requestAnimationFrame
(
this
.
updateIsStuck
);
this
.
$nextTick
(
this
.
updateIsStuck
);
this
.
updating
=
true
;
}
},
...
...
@@ -148,25 +141,8 @@ export default {
/>
<span
v-show=
"activeFile"
class=
"prepend-left-5"
>
<strong
class=
"prepend-right-5"
>
{{
truncatedDiffPath
(
activeFile
)
}}
</strong>
<clipboard-button
:text=
"activeFile"
:title=
"s__('Copy file name to clipboard')"
tooltip-placement=
"bottom"
tooltip-container=
"body"
class=
"btn btn-default btn-transparent btn-clipboard"
/>
</span>
<span
v-show=
"!isStuck"
id=
"diff-stats"
class=
"diff-stats-additions-deletions-expanded"
class=
"js-diff-stats-additions-deletions-expanded
diff-stats-additions-deletions-expanded"
>
with
<strong
class=
"cgreen"
>
...
...
@@ -177,6 +153,17 @@ export default {
{{
pluralize
(
`${sumRemovedLines
}
deletion`
,
sumRemovedLines
)
}}
<
/strong
>
<
/span
>
<
div
class
=
"
js-diff-stats-additions-deletions-collapsed
diff-stats-additions-deletions-collapsed float-right d-sm-none
"
>
<
strong
class
=
"
cgreen
"
>
+
{{
sumAddedLines
}}
<
/strong
>
<
strong
class
=
"
cred
"
>
-
{{
sumRemovedLines
}}
<
/strong
>
<
/div
>
<
/div
>
<
/div
>
<
/div
>
...
...
app/assets/javascripts/diffs/components/changed_files_dropdown.vue
浏览文件 @
289530a0
...
...
@@ -40,7 +40,7 @@ export default {
{{
n__
(
'
%d changed file
'
,
'
%d changed files
'
,
diffFiles
.
length
)
}}
</span>
<icon
:size=
"8
"
class=
"caret-icon
"
name=
"chevron-down"
/>
</button>
...
...
app/assets/javascripts/diffs/components/diff_file.vue
浏览文件 @
289530a0
...
...
@@ -25,7 +25,6 @@ export default {
},
data
()
{
return
{
isActive
:
false
,
isLoadingCollapsedDiff
:
false
,
forkMessageVisible
:
false
,
};
...
...
@@ -48,12 +47,6 @@ export default {
return
this
.
isCollapsed
&&
!
this
.
isLoadingCollapsedDiff
&&
!
this
.
file
.
tooLarge
;
},
},
mounted
()
{
document
.
addEventListener
(
'
scroll
'
,
this
.
handleScroll
);
},
beforeDestroy
()
{
document
.
removeEventListener
(
'
scroll
'
,
this
.
handleScroll
);
},
methods
:
{
...
mapActions
(
'
diffs
'
,
[
'
loadCollapsedDiff
'
]),
handleToggle
()
{
...
...
@@ -65,36 +58,6 @@ export default {
this
.
file
.
collapsed
=
!
this
.
file
.
collapsed
;
}
},
handleScroll
()
{
if
(
!
this
.
updating
)
{
requestAnimationFrame
(
this
.
scrollUpdate
.
bind
(
this
));
this
.
updating
=
true
;
}
},
scrollUpdate
()
{
const
header
=
document
.
querySelector
(
'
.js-diff-files-changed
'
);
if
(
!
header
)
{
this
.
updating
=
false
;
return
;
}
const
{
top
,
bottom
}
=
this
.
$el
.
getBoundingClientRect
();
const
{
top
:
topOfFixedHeader
,
bottom
:
bottomOfFixedHeader
}
=
header
.
getBoundingClientRect
();
const
headerOverlapsContent
=
top
<
topOfFixedHeader
&&
bottom
>
bottomOfFixedHeader
;
const
fullyAboveHeader
=
bottom
<
bottomOfFixedHeader
;
const
fullyBelowHeader
=
top
>
topOfFixedHeader
;
if
(
headerOverlapsContent
&&
!
this
.
isActive
)
{
this
.
$emit
(
'
setActive
'
);
this
.
isActive
=
true
;
}
else
if
(
this
.
isActive
&&
(
fullyAboveHeader
||
fullyBelowHeader
))
{
this
.
$emit
(
'
unsetActive
'
);
this
.
isActive
=
false
;
}
this
.
updating
=
false
;
},
handleLoadCollapsedDiff
()
{
this
.
isLoadingCollapsedDiff
=
true
;
...
...
app/assets/stylesheets/pages/diff.scss
浏览文件 @
289530a0
...
...
@@ -518,6 +518,12 @@
outline
:
none
;
color
:
$gl-link-hover-color
;
}
.caret-icon
{
position
:
relative
;
top
:
2px
;
left
:
-1px
;
}
}
// Mobile
...
...
changelogs/unreleased/48789-remove-event-listeners-scroll.yml
0 → 100644
浏览文件 @
289530a0
---
title
:
Improves performance on Merge Request diff tab by removing the scroll event
listeners being added to every file
merge_request
:
author
:
type
:
performance
locale/gitlab.pot
浏览文件 @
289530a0
...
...
@@ -1666,9 +1666,6 @@ msgstr ""
msgid "Copy commit SHA to clipboard"
msgstr ""
msgid "Copy file name to clipboard"
msgstr ""
msgid "Copy file path to clipboard"
msgstr ""
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录