Fix empty space on the right side due to scrollbar placeholder when body height at 100%. Closes cburgmer#95

cburgmer · cburgmer · commit 6c7b47c8d436 · 2015-03-23T22:04:22.000+01:00
diff --git a/src/browser.js b/src/browser.js
@@ -80,6 +80,8 @@ var browser = (function (util, proxies, ayepromise, theWindow) {
         iframe.style.left = (-10000 - width) + "px";
         // Don't execute JS, all we need from sandboxing is access to the iframe's document
         iframe.sandbox = 'allow-same-origin';
+        // Don't include a scrollbar on Linux
+        iframe.scrolling = 'no';
         return iframe;
     };
 
diff --git a/test/specs/BrowserSpec.js b/test/specs/BrowserSpec.js
@@ -386,6 +386,20 @@ describe("Browser functions", function () {
             });
         });
 
+        it("should not include a scrollbar in calculations on Unix systems", function (done) {
+            setHtml('<style>' +
+                    'html, body { height: 100%; }' +
+                    '</style>');
+
+            // For Firefox width and height seem to be important, too small will not trigger the error
+            browser.calculateDocumentContentSize(doc, {width: 600, height: 200}).then(function (size) {
+                expect(size.width).toBe(600);
+                expect(size.viewportWidth).toBe(600);
+
+                done();
+            });
+        });
+
         describe("zooming", function () {
             it("should report half the viewport size for a zoom of 2", function (done) {
                 setElementWithSize({});
