From 12826329347221b46496c6ff5dfa390c20a01585 Mon Sep 17 00:00:00 2001
From: mrmr1993
Date: Thu, 14 Sep 2017 19:40:16 +0100
Subject: Always use getBoundingClientRect for getViewportTopLeft

---
 lib/dom_utils.coffee | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/dom_utils.coffee b/lib/dom_utils.coffee
index d0bd4615..21a80330 100644
--- a/lib/dom_utils.coffee
+++ b/lib/dom_utils.coffee
@@ -291,12 +291,16 @@ DomUtils =
   getViewportTopLeft: ->
     box = document.documentElement
     style = getComputedStyle box
+    rect = box.getBoundingClientRect()
+    {clientTop, clientLeft} = box
     if style.position == "static" and not /content|paint|strict/.test(style.contain or "")
-      zoom = +style.zoom || 1
-      top: Math.ceil(window.scrollY / zoom), left: Math.ceil(window.scrollX / zoom)
+      # The margin is included in the client rect, so we need to subtract it back out.
+      marginTop = parseInt style.marginTop
+      marginLeft = parseInt style.marginLeft
+      top: -rect.top + marginTop, left: -rect.left + marginLeft
     else
-      rect = box.getBoundingClientRect()
-      top: -rect.top - box.clientTop, left: -rect.left - box.clientLeft
+      top: -rect.top - clientTop, left: -rect.left - clientLeft
+
 
   suppressPropagation: (event) ->
     event.stopImmediatePropagation()
-- 
cgit v1.2.3