From 4817368010755d60b4a9bf558b878f5b11ba8063 Mon Sep 17 00:00:00 2001
From: "Davide P. Cervone" <dpvc@union.edu>
Date: Mon, 11 Jul 2016 19:56:00 -0400
Subject: [PATCH] Use getBoundingClientRect() to improve handling of menu
placement when the body is scrolled or has margin settings. Resolves issue
#1434.
---
unpacked/extensions/MathMenu.js | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/unpacked/extensions/MathMenu.js b/unpacked/extensions/MathMenu.js
index 34dbc4053..3b6f575ee 100644
--- a/unpacked/extensions/MathMenu.js
+++ b/unpacked/extensions/MathMenu.js
@@ -313,6 +313,9 @@
this.posted = true;
if (menu.offsetWidth) menu.style.width = (menu.offsetWidth+2) + "px";
var x = event.pageX, y = event.pageY;
+ var bbox = document.body.getBoundingClientRect();
+ var styles = window.getComputedStyle(document.body);
+ var bodyRight = bbox.right - Math.min(0,bbox.left) + parseFloat(styles.marginLeft);
if (!x && !y && "clientX" in event) {
x = event.clientX + document.body.scrollLeft + document.documentElement.scrollLeft;
y = event.clientY + document.body.scrollTop + document.documentElement.scrollTop;
@@ -326,8 +329,8 @@
x = (rect.right + rect.left) / 2 + offsetX;
y = (rect.bottom + rect.top) / 2 + offsetY;
}
- if (x + menu.offsetWidth > document.body.offsetWidth - this.margin)
- {x = document.body.offsetWidth - menu.offsetWidth - this.margin}
+ if (x + menu.offsetWidth > bodyRight - this.margin)
+ {x = bodyRight - menu.offsetWidth - this.margin}
if (MENU.isMobile) {x = Math.max(5,x-Math.floor(menu.offsetWidth/2)); y -= 20}
MENU.skipUp = event.isContextMenu;
} else {
@@ -339,7 +342,7 @@
}
if (!MENU.isMobile) {
if ((MENU.isRTL && x - mw - menu.offsetWidth > this.margin) ||
- (!MENU.isRTL && x + menu.offsetWidth > document.body.offsetWidth - this.margin))
+ (!MENU.isRTL && x + menu.offsetWidth > bodyRight - this.margin))
{side = "right"; x = Math.max(this.margin,x - mw - menu.offsetWidth + 6)}
}
if (!isPC) {