summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Bennett <lbennett@gitlab.com>2018-11-21 12:44:43 +0000
committerLuke Bennett <lbennett@gitlab.com>2018-11-21 13:23:09 +0000
commit3616252c73bb387260a7a4d514a55556c04f28f0 (patch)
tree55ef91d1d1831cdd92d9543021ce4b884e4abf64
parentddc3bc2dd3ebb52818a815c29b78303bf6607465 (diff)
downloadgitlab-ce-ce-attempt-to-fix-lazy_loader_spec-transient-failure.tar.gz
Remove unneeded requestAnimationFrame dependency propertyce-attempt-to-fix-lazy_loader_spec-transient-failure
-rw-r--r--app/assets/javascripts/lazy_loader.js3
-rw-r--r--spec/javascripts/lazy_loader_spec.js4
2 files changed, 2 insertions, 5 deletions
diff --git a/app/assets/javascripts/lazy_loader.js b/app/assets/javascripts/lazy_loader.js
index c5b6945da3b..af50ea9d6c2 100644
--- a/app/assets/javascripts/lazy_loader.js
+++ b/app/assets/javascripts/lazy_loader.js
@@ -9,9 +9,6 @@ export default class LazyLoader {
this.intersectionObserver = null;
this.lazyImages = [];
this.observerNode = options.observerNode || '#content-body';
- this.requestAnimationFrame = (
- options.requestAnimationFrame || window.requestAnimationFrame
- ).bind(window);
const scrollContainer = options.scrollContainer || window;
scrollContainer.addEventListener('load', () => this.register());
diff --git a/spec/javascripts/lazy_loader_spec.js b/spec/javascripts/lazy_loader_spec.js
index 67e73fc3c6f..cbdc1644430 100644
--- a/spec/javascripts/lazy_loader_spec.js
+++ b/spec/javascripts/lazy_loader_spec.js
@@ -19,13 +19,13 @@ describe('LazyLoader', function() {
lazyLoader = new LazyLoader({
observerNode: 'foobar',
- requestAnimationFrame: execImmediately,
});
spyOn(LazyLoader, 'supportsIntersectionObserver').and.callFake(() => false);
spyOn(LazyLoader, 'loadImage').and.callThrough();
+ spyOn(window, 'requestAnimationFrame').and.callFake(execImmediately);
spyOn(window, 'requestIdleCallback').and.callFake(execImmediately);
// Doing everything that happens normally in onload
@@ -135,11 +135,11 @@ describe('LazyLoader', function() {
lazyLoader = new LazyLoader({
observerNode: 'foobar',
- requestAnimationFrame: execImmediately,
});
spyOn(LazyLoader, 'loadImage').and.callThrough();
+ spyOn(window, 'requestAnimationFrame').and.callFake(execImmediately);
spyOn(window, 'requestIdleCallback').and.callFake(execImmediately);
// Doing everything that happens normally in onload