diff options
| author | redmatrix <git@macgirvin.com> | 2016-03-20 19:56:36 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-03-20 19:56:36 -0700 |
| commit | d3e7ef70e841c819d8ecf5e4b0900cb3f5b19aa4 (patch) | |
| tree | 1fae16c33c620e6bfbfd14108692d61c70c04885 /view | |
| parent | fea532af4da522001c71eb79df5fc49c83833da9 (diff) | |
| parent | f5b22dfd5be2a8b1126a12fc389d359a46f8544b (diff) | |
| download | volse-hubzilla-d3e7ef70e841c819d8ecf5e4b0900cb3f5b19aa4.tar.gz volse-hubzilla-d3e7ef70e841c819d8ecf5e4b0900cb3f5b19aa4.tar.bz2 volse-hubzilla-d3e7ef70e841c819d8ecf5e4b0900cb3f5b19aa4.zip | |
Merge https://github.com/redmatrix/hubzilla into pending_merge
Diffstat (limited to 'view')
| -rw-r--r-- | view/js/acl.js | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/view/js/acl.js b/view/js/acl.js index 70440b572..65f1009ed 100644 --- a/view/js/acl.js +++ b/view/js/acl.js @@ -121,8 +121,10 @@ ACL.prototype.on_button_show = function(event) { event.stopImmediatePropagation(); event.stopPropagation(); - that.set_allow($(this).parent().attr('id')); - that.on_submit(); + if(!$(this).parent().hasClass("grouphide")) { + that.set_allow($(this).parent().attr('id')); + that.on_submit(); + } return false; }; @@ -245,12 +247,15 @@ ACL.prototype.update_view = function() { break; case "c": if (that.allow_cid.indexOf(id)>=0){ - btshow.removeClass("btn-default").addClass("btn-success"); - bthide.removeClass("btn-danger").addClass("btn-default"); + if(!$(this).hasClass("grouphide") ) { + btshow.removeClass("btn-default").addClass("btn-success"); + bthide.removeClass("btn-danger").addClass("btn-default"); + } } if (that.deny_cid.indexOf(id)>=0){ btshow.removeClass("btn-success").addClass("btn-default"); bthide.removeClass("btn-default").addClass("btn-danger"); + $(this).removeClass("groupshow"); } } }); |