Ignore elements with display:none properties

gemini-testing · Feb 25, 2014 · cf9834d · cf9834d
1 parent b9f7bcc
commit cf9834d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/lib/element-rect.js b/lib/element-rect.js
@@ -3,17 +3,22 @@ var q = require('q'),
     Rect = require('./geometery/rect');
 
 exports.getMultiple = function getMultiple(elements) {
-    return q.all(Object.keys(elements).map(function(key) {
+    var elementsArray = Object.keys(elements).map(function(key) {
-            return exports.get(elements[key]);
+        return elements[key];
+    });
+    return q.all(elementsArray.map(function(element) {
+            return element.getCssValue('display');
         }))
+        .then(function(displays) {
+            var visibleElements = elementsArray.filter(function(element, index) {
+                return displays[index] !== 'none';
+            });
+            return q.all(visibleElements.map(exports.get));
+        })
         .then(function(rects) {
-            return rects
+            return rects.reduce(function(first, second) {
-                .filter(function(rect) {
+                return first.merge(second);
-                    return !rect.isZero();
+            });
-                })
-                .reduce(function(first, second) {
-                    return first.merge(second);
-                });
         });
 };
 

diff --git a/lib/geometery/rect.js b/lib/geometery/rect.js
@@ -38,10 +38,6 @@ var Rect = inherit({
             Math.max(this.right, other.right) - x,
             Math.max(this.bottom, other.bottom) - y
         );
-    },
-
-    isZero: function() {
-        return this.width === 0 || this.height === 0;
     }
 
 });