fix handling of hidden elements by row, closes #28

liabru · Sep 16, 2014 · 71a5151 · 71a5151
1 parent 56214a1
commit 71a5151
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/jquery.matchHeight-min.js b/jquery.matchHeight-min.js
diff --git a/jquery.matchHeight.js b/jquery.matchHeight.js
@@ -123,6 +123,10 @@
  var scrollTop = $(window).scrollTop(),
  htmlHeight = $('html').outerHeight(true);
 
+ // temporarily must force hidden parents visible
+ var $hiddenParents = $elements.parents().filter(':hidden');
+ $hiddenParents.css('display', 'block');
+
  // get rows if using byRow, otherwise assume one row
  if (byRow) {
 
@@ -164,10 +168,6 @@
  if (byRow && $row.length <= 1)
  return;
 
- // ensure elements are visible to prevent 0 height
- var hiddenParents = $row.parents().add($row).filter(':hidden');
- hiddenParents.css({ 'display': 'block' });
-
  // iterate the row and find the max height
  $row.each(function(){
  var $that = $(this),
@@ -181,12 +181,9 @@
  maxHeight = $that.outerHeight(false);
 
  // revert display block
- $that.css({ 'display': '' });
+ $that.css('display', '');
  });
 
- // revert display block
- hiddenParents.css({ 'display': '' });
-
  // iterate the row and apply the height to all elements
  $row.each(function(){
  var $that = $(this),
@@ -203,6 +200,9 @@
  });
  });
 
+ // revert hidden parents
+ $hiddenParents.css('display', '');
+
  // restore scroll position if enabled
  if ($.fn.matchHeight._maintainScroll)
  $(window).scrollTop((scrollTop / htmlHeight) * $('html').outerHeight(true));