Merge branch 'patch-1' of https://github.com/Spreadyy/qutebrowser into Spreadyy-patch-1

This commit is contained in:
Florian Bruhin 2016-10-03 06:51:37 +02:00
commit fc1943e5e6

View File

@ -61,12 +61,13 @@ window._qutebrowser.scroll = (function() {
funcs.pos = function() { funcs.pos = function() {
var elem = document.documentElement; var elem = document.documentElement;
var body = document.body;
var pos = { var pos = {
"px": {"x": window.scrollX, "y": window.scrollY}, "px": {"x": window.scrollX, "y": window.scrollY},
"scroll": { "scroll": {
"width": elem.scrollWidth, "width": Math.max(body.scrollWidth, elem.scrollWidth),
"height": elem.scrollHeight, "height": Math.max(body.scrollHeight, elem.scrollHeight),
}, },
"inner": { "inner": {
"width": window.innerWidth, "width": window.innerWidth,