summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2017-12-21 15:48:24 +0000
committerFilipa Lacerda <filipa@gitlab.com>2017-12-21 15:55:32 +0000
commit7c636732fba98935922ffaadc49b328417e9036c (patch)
treeffe43efdc23dc13adc06e0be165e8ed128551d11
parent889c7081f1c8bea2cd2cf7d50854babd7df92f72 (diff)
downloadgitlab-ce-7c636732fba98935922ffaadc49b328417e9036c.tar.gz
Use non cached variables to get scroll position because of the performance bar
-rw-r--r--app/assets/javascripts/job.js24
1 files changed, 14 insertions, 10 deletions
diff --git a/app/assets/javascripts/job.js b/app/assets/javascripts/job.js
index 198a7823381..e1b2506e437 100644
--- a/app/assets/javascripts/job.js
+++ b/app/assets/javascripts/job.js
@@ -96,14 +96,14 @@ export default class Job {
// eslint-disable-next-line class-methods-use-this
canScroll() {
- return this.$document.height() > this.$window.height();
+ return $(document).height() > $(window).height();
}
toggleScroll() {
- const currentPosition = this.$document.scrollTop();
- const scrollHeight = this.$document.height();
+ const currentPosition = $(document).scrollTop();
+ const scrollHeight = $(document).height();
- const windowHeight = this.$window.height();
+ const windowHeight = $(window).height();
if (this.canScroll()) {
if (currentPosition > 0 &&
(scrollHeight - currentPosition !== windowHeight)) {
@@ -127,18 +127,22 @@ export default class Job {
this.toggleDisableButton(this.$scrollBottomBtn, true);
}
}
-
+ // eslint-disable-next-line class-methods-use-this
isScrolledToBottom() {
- const currentPosition = this.$document.scrollTop();
- const scrollHeight = this.$document.height();
+ const $document = $(document);
+
+ const currentPosition = $document.scrollTop();
+ const scrollHeight = $document.height();
+
+ const windowHeight = $(window).height();
- const windowHeight = this.$window.height();
return scrollHeight - currentPosition === windowHeight;
}
// eslint-disable-next-line class-methods-use-this
scrollDown() {
- this.$document.scrollTop(this.$document.height());
+ const $document = $(document);
+ $document.scrollTop($document.height());
}
scrollToBottom() {
@@ -148,7 +152,7 @@ export default class Job {
}
scrollToTop() {
- this.$document.scrollTop(0);
+ $(document).scrollTop(0);
this.hasBeenScrolled = true;
this.toggleScroll();
}