Merge branch '9721-cannot-scroll-forwards-in-time-for-roadmap-view-ce' into 'master'

CE Port of fix for roadmap forward timeline scroll

See merge request gitlab-org/gitlab-ce!25217

2 files changed, 2 insertions, 1 deletions

diff --git a/app/assets/javascripts/lib/utils/common_utils.js b/app/assets/javascripts/lib/utils/common_utils.js
index 0ceff10a02a..29fe460017e 100644
--- a/app/assets/javascripts/lib/utils/common_utils.js
+++ b/app/assets/javascripts/lib/utils/common_utils.js
@@ -130,7 +130,7 @@ export const isInViewport = (el, offset = {}) => {
     rect.top >= (top || 0) &&
     rect.left >= (left || 0) &&
     rect.bottom <= window.innerHeight &&
-    rect.right <= window.innerWidth
+    parseInt(rect.right, 10) <= window.innerWidth
   );
 };
 
diff --git a/spec/javascripts/lib/utils/common_utils_spec.js b/spec/javascripts/lib/utils/common_utils_spec.js
index 3eff3f655ee..c02e37950f8 100644
--- a/spec/javascripts/lib/utils/common_utils_spec.js
+++ b/spec/javascripts/lib/utils/common_utils_spec.js
@@ -855,6 +855,7 @@ describe('common_utils', () => {
     });
 
     it('returns true when provided `el` is in viewport', () => {
+      el.setAttribute('style', `position: absolute; right: ${window.innerWidth + 0.2};`);
       document.body.appendChild(el);
 
       expect(commonUtils.isInViewport(el)).toBe(true);