diff --git a/4chan_x.js b/4chan_x.js index 8198386c5..9f13b84dd 100644 --- a/4chan_x.js +++ b/4chan_x.js @@ -232,7 +232,7 @@ height = el.offsetHeight; top = clientY - 120; bot = top + height; - el.style.top = ui.winHeight < height || top < 0 ? 0 : bot > ui.winHeight ? ui.winHeight - height : top; + el.style.top = ui.winHeight < height || top < 0 ? '0px' : bot > ui.winHeight ? ui.winHeight - height + 'px' : top + 'px'; return el.style.left = clientX + 45; }, hoverend: function(e) { @@ -1718,8 +1718,7 @@ } } $.show(qp); - ui.el = qp; - return ui.winHeight = d.body.clientHeight; + return ui.el = qp; }, parse: function(req, id, threadID) { var body, html, op, qp, reply, _i, _len, _ref; @@ -1959,7 +1958,8 @@ el.src = this.parentNode.href; $.show(el); ui.el = el; - return ui.winHeight = d.body.clientHeight; + ui.winHeight = d.body.clientHeight; + return ui.winWidth = d.body.clientWidth; } } }; diff --git a/script.coffee b/script.coffee index bdd92002b..1f22b60fb 100644 --- a/script.coffee +++ b/script.coffee @@ -150,11 +150,11 @@ ui = bot = top + height el.style.top = if ui.winHeight < height or top < 0 - 0 + '0px' else if bot > ui.winHeight - ui.winHeight - height + ui.winHeight - height + 'px' else - top + top + 'px' el.style.left = clientX + 45 hoverend: (e) -> $.hide ui.el @@ -1368,7 +1368,6 @@ quotePreview = g.requests[threadID] = $.get @href, (-> quotePreview.parse this, id, threadID) $.show qp ui.el = qp - ui.winHeight = d.body.clientHeight parse: (req, id, threadID) -> qp = $ '#qp' return unless qp.innerHTML is "Loading #{id}..." @@ -1520,6 +1519,7 @@ imageHover = $.show el ui.el = el ui.winHeight = d.body.clientHeight + ui.winWidth = d.body.clientWidth imgPreloading = init: ->