aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-01-04 14:48:13 -0800
committerfriendica <info@friendica.com>2015-01-04 14:48:13 -0800
commit91cb76aa99d56a134717dfe427d3abd8e81061af (patch)
tree6993789a672dd43ea623bc78a85dfbe513f73f16
parent57d8271ebaaf56d2abdadb9f73deec466ebd590d (diff)
parent83631ffd23ccfce4649c883a792cecab35a611d7 (diff)
downloadvolse-hubzilla-91cb76aa99d56a134717dfe427d3abd8e81061af.tar.gz
volse-hubzilla-91cb76aa99d56a134717dfe427d3abd8e81061af.tar.bz2
volse-hubzilla-91cb76aa99d56a134717dfe427d3abd8e81061af.zip
Merge https://github.com/friendica/red into pending_merge
-rw-r--r--view/js/acl.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/view/js/acl.js b/view/js/acl.js
index f9428e1c5..77c65e21d 100644
--- a/view/js/acl.js
+++ b/view/js/acl.js
@@ -258,7 +258,7 @@ ACL.prototype.get = function(start,count, search){
}
ACL.prototype.populate = function(data){
- var height = Math.ceil(data.tot / that.nw) * 42;
+ var height = Math.ceil(data.items.length / that.nw) * 42;
that.list_content.height(height);
$(data.items).each(function(){
html = "<div class='acl-list-item {4} {7} {5}' title='{6}' id='{2}{3}'>"+that.item_tpl+"</div>";