aboutsummaryrefslogtreecommitdiffstats
path: root/view/js
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-03-20 15:32:09 -0700
committerredmatrix <git@macgirvin.com>2016-03-20 15:32:09 -0700
commit23151100dee1051d77d893a616cbc166eb5dcca1 (patch)
tree57b3d70d9a09248613270cd0bcbf515630f1d320 /view/js
parenteb68b66c58fb0fb0511827a51d39ef0b6aff6d33 (diff)
parent23419e4c26a3f971dd9ec50a37c78c009c12ffca (diff)
downloadvolse-hubzilla-23151100dee1051d77d893a616cbc166eb5dcca1.tar.gz
volse-hubzilla-23151100dee1051d77d893a616cbc166eb5dcca1.tar.bz2
volse-hubzilla-23151100dee1051d77d893a616cbc166eb5dcca1.zip
Merge https://github.com/redmatrix/hubzilla into pending_merge
Diffstat (limited to 'view/js')
-rw-r--r--view/js/acl.js11
1 files changed, 6 insertions, 5 deletions
diff --git a/view/js/acl.js b/view/js/acl.js
index 6d94b4987..70440b572 100644
--- a/view/js/acl.js
+++ b/view/js/acl.js
@@ -231,14 +231,15 @@ ACL.prototype.update_view = function() {
}
$(that.group_uids[id]).each(function(i, v) {
if(uclass == "grouphide")
- $("#c"+v).removeClass("groupshow");
+ // we need attr selection here because the id can include an @ (diaspora/friendica xchans)
+ $('[id="c' + v + '"]').removeClass("groupshow");
if(uclass !== "") {
- var cls = $("#c"+v).attr('class');
+ var cls = $('[id="c' + v + '"]').attr('class');
if( cls === undefined)
return true;
var hiding = cls.indexOf('grouphide');
if(hiding == -1)
- $("#c"+v).addClass(uclass);
+ $('[id="c' + v + '"]').addClass(uclass);
}
});
break;
@@ -277,7 +278,7 @@ ACL.prototype.populate = function(data) {
$(data.items).each(function(){
html = "<div class='acl-list-item {4} {7} {5}' title='{6}' id='{2}{3}'>"+that.item_tpl+"</div>";
html = html.format(this.photo, this.name, this.type, this.xid, '', this.self, this.link, this.taggable);
- if (this.uids !== undefined) that.group_uids[this.id] = this.uids;
+ if (this.uids !== undefined) that.group_uids[this.xid] = this.uids;
//console.log(html);
that.list_content.append(html);
});
@@ -287,4 +288,4 @@ ACL.prototype.populate = function(data) {
$(el).removeAttr("data-src");
});
that.update_view();
-}; \ No newline at end of file
+};