Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
289530a0
Commit
289530a0
authored
Jul 12, 2018
by
Filipa Lacerda
Committed by
Phil Hughes
Jul 12, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve "Improve performance of MR Changes tab: reduce event listeners on scroll event"
parent
eddf34f4
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
27 additions
and
84 deletions
+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
No files found.
app/assets/javascripts/diffs/components/app.vue
View file @
289530a0
...
@@ -41,11 +41,6 @@ export default {
...
@@ -41,11 +41,6 @@ export default {
required
:
true
,
required
:
true
,
},
},
},
},
data
()
{
return
{
activeFile
:
''
,
};
},
computed
:
{
computed
:
{
...
mapState
({
...
mapState
({
isLoading
:
state
=>
state
.
diffs
.
isLoading
,
isLoading
:
state
=>
state
.
diffs
.
isLoading
,
...
@@ -126,14 +121,6 @@ export default {
...
@@ -126,14 +121,6 @@ export default {
eventHub
.
$emit
(
'
fetchNotesData
'
);
eventHub
.
$emit
(
'
fetchNotesData
'
);
}
}
},
},
setActive
(
filePath
)
{
this
.
activeFile
=
filePath
;
},
unsetActive
(
filePath
)
{
if
(
this
.
activeFile
===
filePath
)
{
this
.
activeFile
=
''
;
}
},
adjustView
()
{
adjustView
()
{
if
(
this
.
shouldShow
&&
this
.
isParallelView
)
{
if
(
this
.
shouldShow
&&
this
.
isParallelView
)
{
window
.
mrTabs
.
expandViewContainer
();
window
.
mrTabs
.
expandViewContainer
();
...
@@ -195,7 +182,6 @@ export default {
...
@@ -195,7 +182,6 @@ export default {
<changed-files
<changed-files
:diff-files=
"diffFiles"
:diff-files=
"diffFiles"
:active-file=
"activeFile"
/>
/>
<div
<div
...
@@ -207,8 +193,6 @@ export default {
...
@@ -207,8 +193,6 @@ export default {
:key=
"file.newPath"
:key=
"file.newPath"
:file=
"file"
:file=
"file"
:current-user=
"currentUser"
:current-user=
"currentUser"
@
setActive=
"setActive(file.filePath)"
@
unsetActive=
"unsetActive(file.filePath)"
/>
/>
</div>
</div>
<no-changes
v-else
/>
<no-changes
v-else
/>
...
...
app/assets/javascripts/diffs/components/changed_files.vue
View file @
289530a0
...
@@ -16,13 +16,6 @@ export default {
...
@@ -16,13 +16,6 @@ export default {
ClipboardButton
,
ClipboardButton
,
},
},
mixins
:
[
changedFilesMixin
],
mixins
:
[
changedFilesMixin
],
props
:
{
activeFile
:
{
type
:
String
,
required
:
false
,
default
:
''
,
},
},
data
()
{
data
()
{
return
{
return
{
isStuck
:
false
,
isStuck
:
false
,
...
@@ -70,7 +63,7 @@ export default {
...
@@ -70,7 +63,7 @@ export default {
pluralize
,
pluralize
,
handleScroll
()
{
handleScroll
()
{
if
(
!
this
.
updating
)
{
if
(
!
this
.
updating
)
{
requestAnimationFrame
(
this
.
updateIsStuck
);
this
.
$nextTick
(
this
.
updateIsStuck
);
this
.
updating
=
true
;
this
.
updating
=
true
;
}
}
},
},
...
@@ -148,25 +141,8 @@ export default {
...
@@ -148,25 +141,8 @@ export default {
/>
/>
<span
<span
v-show=
"activeFile"
class=
"js-diff-stats-additions-deletions-expanded
class=
"prepend-left-5"
diff-stats-additions-deletions-expanded"
>
<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"
>
>
with
with
<strong
class=
"cgreen"
>
<strong
class=
"cgreen"
>
...
@@ -177,6 +153,17 @@ export default {
...
@@ -177,6 +153,17 @@ export default {
{{
pluralize
(
`${sumRemovedLines
}
deletion`
,
sumRemovedLines
)
}}
{{
pluralize
(
`${sumRemovedLines
}
deletion`
,
sumRemovedLines
)
}}
<
/strong
>
<
/strong
>
<
/span
>
<
/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
>
<
/div
>
<
/div
>
<
/div
>
...
...
app/assets/javascripts/diffs/components/changed_files_dropdown.vue
View file @
289530a0
...
@@ -40,7 +40,7 @@ export default {
...
@@ -40,7 +40,7 @@ export default {
{{
n__
(
'
%d changed file
'
,
'
%d changed files
'
,
diffFiles
.
length
)
}}
{{
n__
(
'
%d changed file
'
,
'
%d changed files
'
,
diffFiles
.
length
)
}}
</span>
</span>
<icon
<icon
:size=
"8
"
class=
"caret-icon
"
name=
"chevron-down"
name=
"chevron-down"
/>
/>
</button>
</button>
...
...
app/assets/javascripts/diffs/components/diff_file.vue
View file @
289530a0
...
@@ -25,7 +25,6 @@ export default {
...
@@ -25,7 +25,6 @@ export default {
},
},
data
()
{
data
()
{
return
{
return
{
isActive
:
false
,
isLoadingCollapsedDiff
:
false
,
isLoadingCollapsedDiff
:
false
,
forkMessageVisible
:
false
,
forkMessageVisible
:
false
,
};
};
...
@@ -48,12 +47,6 @@ export default {
...
@@ -48,12 +47,6 @@ export default {
return
this
.
isCollapsed
&&
!
this
.
isLoadingCollapsedDiff
&&
!
this
.
file
.
tooLarge
;
return
this
.
isCollapsed
&&
!
this
.
isLoadingCollapsedDiff
&&
!
this
.
file
.
tooLarge
;
},
},
},
},
mounted
()
{
document
.
addEventListener
(
'
scroll
'
,
this
.
handleScroll
);
},
beforeDestroy
()
{
document
.
removeEventListener
(
'
scroll
'
,
this
.
handleScroll
);
},
methods
:
{
methods
:
{
...
mapActions
(
'
diffs
'
,
[
'
loadCollapsedDiff
'
]),
...
mapActions
(
'
diffs
'
,
[
'
loadCollapsedDiff
'
]),
handleToggle
()
{
handleToggle
()
{
...
@@ -65,36 +58,6 @@ export default {
...
@@ -65,36 +58,6 @@ export default {
this
.
file
.
collapsed
=
!
this
.
file
.
collapsed
;
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
()
{
handleLoadCollapsedDiff
()
{
this
.
isLoadingCollapsedDiff
=
true
;
this
.
isLoadingCollapsedDiff
=
true
;
...
...
app/assets/stylesheets/pages/diff.scss
View file @
289530a0
...
@@ -518,6 +518,12 @@
...
@@ -518,6 +518,12 @@
outline
:
none
;
outline
:
none
;
color
:
$gl-link-hover-color
;
color
:
$gl-link-hover-color
;
}
}
.caret-icon
{
position
:
relative
;
top
:
2px
;
left
:
-1px
;
}
}
}
// Mobile
// Mobile
...
...
changelogs/unreleased/48789-remove-event-listeners-scroll.yml
0 → 100644
View file @
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
View file @
289530a0
...
@@ -1666,9 +1666,6 @@ msgstr ""
...
@@ -1666,9 +1666,6 @@ msgstr ""
msgid "Copy commit SHA to clipboard"
msgid "Copy commit SHA to clipboard"
msgstr ""
msgstr ""
msgid "Copy file name to clipboard"
msgstr ""
msgid "Copy file path to clipboard"
msgid "Copy file path to clipboard"
msgstr ""
msgstr ""
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment