diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-06-23 17:30:35 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-06-23 17:30:35 -0700 |
| commit | 833098e3460e0a2c7fbffaa59163af815f419e68 (patch) | |
| tree | b13bc70bf34288659be12c64ab7a5ed0ce131dd2 /view/js | |
| parent | ae6612025dcd31349056364d0c701bfda58470db (diff) | |
| parent | 7975bc828fc9ae1cf9b92cc2147297a46524d59f (diff) | |
| download | volse-hubzilla-833098e3460e0a2c7fbffaa59163af815f419e68.tar.gz volse-hubzilla-833098e3460e0a2c7fbffaa59163af815f419e68.tar.bz2 volse-hubzilla-833098e3460e0a2c7fbffaa59163af815f419e68.zip | |
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
include/items.php
mod/item.php
Diffstat (limited to 'view/js')
| -rw-r--r-- | view/js/main.js | 2 | ||||
| -rw-r--r-- | view/js/mod_directory.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/view/js/main.js b/view/js/main.js index 625ac5b01..698e2d79c 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -615,7 +615,7 @@ function updateConvItems(mode,data) { function collapseHeight() { - $(".wall-item-body, .contact-info").each(function() { + $(".wall-item-body, .directory-collapse").each(function() { var orgHeight = $(this).height(); if(orgHeight > divmore_height + 10) { if(! $(this).hasClass('divmore')) { diff --git a/view/js/mod_directory.js b/view/js/mod_directory.js index 90942f9ac..e850963c1 100644 --- a/view/js/mod_directory.js +++ b/view/js/mod_directory.js @@ -38,4 +38,4 @@ function postRatings() { $(document).ready(function() { collapseHeight(); -});
\ No newline at end of file +}); |