slightly smaller

teamcapybara · May 13, 2019 · e8a0d62 · e8a0d62
1 parent da29c06
commit e8a0d62
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 37 deletions.
diff --git a/lib/capybara/selenium/atoms/isDisplayed.min.js b/lib/capybara/selenium/atoms/isDisplayed.min.js
diff --git a/lib/capybara/selenium/atoms/src/isDisplayed.js b/lib/capybara/selenium/atoms/src/isDisplayed.js
@@ -17,7 +17,7 @@
     // Child of DETAILS element is not shown unless the DETAILS element is open
     // or the child is a SUMMARY element.
 
-    var parent = elem.parentElement;
+    var parent = getParentElement(elem);
     if (parent && parent.tagName && (parent.tagName.toUpperCase() == "DETAILS") &&
         !parent.open && !(elemTagName == "SUMMARY")) {
       return false;
@@ -104,47 +104,20 @@
     return !hiddenByOverflow(elem);
   }
 
-  function getClientRegion(elem, opt_region) {
-    // var region = getClientRect(elem).toBox();
+  function getClientRegion(elem) {
     var region = getClientRect(elem);
-
-    // if (opt_region) {
-    //   var rect = opt_region instanceof goog.math.Rect ? opt_region :
-    //       new goog.math.Rect(opt_region.x, opt_region.y, 1, 1);
-    //   region.left = goog.math.clamp(
-    //       region.left + rect.left, region.left, region.right);
-    //   region.top = goog.math.clamp(
-    //       region.top + rect.top, region.top, region.bottom);
-    //   region.right = goog.math.clamp(
-    //       region.left + rect.width, region.left, region.right);
-    //   region.bottom = goog.math.clamp(
-    //       region.top + rect.height, region.top, region.bottom);
-    // }
-    //
-    // return region;
-
     return { left: region.left,
              right: region.left + region.width,
              top: region.top,
              bottom: region.top + region.height };
   }
 
-
   function getParentElement(node) {
     return node.parentElement
-    // var elem = node.parentNode;
-    //
-    // while (elem &&
-    //        elem.nodeType != Node.ELEMENT_NODE &&
-    //        elem.nodeType != Node.DOCUMENT_NODE &&
-    //        elem.nodeType != Node.DOCUMENT_FRAGMENT_NODE) {
-    //   elem = elem.parentNode;
-    // }
-    // return (elem && elem.nodeType == Node.ELEMENT_NODE) ? elem : null;
   }
 
-  function getOverflowState(elem, opt_region) {
-    var region = getClientRegion(elem, opt_region);
+  function getOverflowState(elem) {
+    var region = getClientRegion(elem);
     var ownerDoc = elem.ownerDocument;
     var htmlElem = ownerDoc.documentElement;
     var bodyElem = ownerDoc.body;
@@ -349,7 +322,7 @@
     }
 
     // Let's apply the parent opacity to the element.
-    var parentElement = elem.parentElement;
+    var parentElement = getParentElement(elem);
     if (parentElement && parentElement.nodeType == Node.ELEMENT_NODE) {
       elemOpacity = elemOpacity * getOpacity(parentElement);
     }
@@ -388,8 +361,8 @@
 
     // Get the <map> associated with this element, or null if none.
     var map = isMap ? elem :
-        ((elem.parentElement.tagName.toUpperCase() == "MAP") ?
-            elem.parentElement : null);
+        ((getParentElement(elem).tagName.toUpperCase() == "MAP") ?
+            getParentElement(elem) : null);
 
     var image = null, rect = null;
     if (map && map.name) {
@@ -425,13 +398,13 @@
 
   function getAncestor(element, matcher) {
     if (element) {
-      element = element.parentElement;
+      element = getParentElement(element);
     }
     while (element) {
       if (matcher(element)) {
         return element;
       }
-      element = element.parentElement;
+      element = getParentElement(element);
     }
     // Reached the root of the DOM without a match
     return null;