isOutsideOfImage: take into account scrolling position

gemini-testing · Apr 24, 2015 · 239c1b6 · 239c1b6
1 parent ed7a683
commit 239c1b6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/lib/browser/client-scripts/gemini.js b/lib/browser/client-scripts/gemini.js
@@ -35,6 +35,7 @@ function prepareScreenshotUnsafe(selectors, opts) {
 
     var viewportHeight = window.innerHeight || document.documentElement.clientHeight,
         documentHeight = document.documentElement.scrollHeight,
+        documentWidth = document.documentElement.scrollWidth,
         coverage;
 
     if (opts.coverage) {
@@ -50,6 +51,7 @@ function prepareScreenshotUnsafe(selectors, opts) {
         ignoreAreas: findIgnoreAreas(opts.ignoreSelectors),
         viewportHeight: Math.round(viewportHeight),
         documentHeight: Math.round(documentHeight),
+        documentWidth: Math.round(documentWidth),
         coverage: coverage,
         canHaveCaret: isEditable(document.activeElement)
     };

diff --git a/lib/capture-session.js b/lib/capture-session.js
@@ -89,7 +89,7 @@ module.exports = inherit({
             ));
         }
 
-        if (isOutsideOfImage(captureArea, imageSize)) {
+        if (isOutsideOfImage(prepareData, imageSize)) {
             throw new StateError(
                 'Can not capture specified region of the page\n' +
                 'The size of a region is larger then image, captured by browser\n' +
@@ -105,8 +105,15 @@ module.exports = inherit({
 
 });
 
-function isOutsideOfImage(area, imageSize) {
-    return area.top < 0 || area.left < 0 || area.left + area.width > imageSize.width;
+function isOutsideOfImage(data, imageSize) {
+    var area = data.captureArea,
+        rightBorder = area.left + area.width;
+
+    if (imageSize.width < data.documentWidth) {
+        rightBorder -= data.viewportOffset.left;
+    }
+
+    return area.top < 0 || area.left < 0 || area.left + area.width - rightBorder > imageSize.width;
 }
 
 function getToImageCoordsFunction(image, prepareData) {