aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorM. Dent <dentm42@gmail.com>2019-10-08 14:26:17 +0200
committerM. Dent <dentm42@gmail.com>2019-10-08 14:26:17 +0200
commitbef5324feafc1f12d0804a769c4dca4f8295d274 (patch)
tree395bdfe18658a9c91c4a33fe9d86a251e6f8af20
parenta435363b949021b1beeb7cb124668f672bf41ea2 (diff)
parentc2655370e0e02e1ee5e6c727ee03c448320b7923 (diff)
downloadvolse-hubzilla-bef5324feafc1f12d0804a769c4dca4f8295d274.tar.gz
volse-hubzilla-bef5324feafc1f12d0804a769c4dca4f8295d274.tar.bz2
volse-hubzilla-bef5324feafc1f12d0804a769c4dca4f8295d274.zip
Merge branch 'cherry-pick-cac0672a' into 'dev'
issue #1401 See merge request hubzilla/core!1750
-rw-r--r--view/js/acl.js10
1 files changed, 7 insertions, 3 deletions
diff --git a/view/js/acl.js b/view/js/acl.js
index 730b515a0..9415113dd 100644
--- a/view/js/acl.js
+++ b/view/js/acl.js
@@ -207,7 +207,7 @@ ACL.prototype.on_button_hide = function(event) {
ACL.prototype.set_allow = function(itemid) {
type = itemid[0];
- id = itemid.substr(1);
+ id = decodeURIComponent(itemid.substr(1));
switch(type) {
case "g":
if (that.allow_gid.indexOf(id)<0) {
@@ -231,7 +231,7 @@ ACL.prototype.set_allow = function(itemid) {
ACL.prototype.set_deny = function(itemid) {
type = itemid[0];
- id = itemid.substr(1);
+ id = decodeURIComponent(itemid.substr(1));
switch(type) {
case "g":
if (that.deny_gid.indexOf(id)<0) {
@@ -310,8 +310,12 @@ ACL.prototype.update_view = function(value) {
else {
that.list.show(); //show acl-list
+ datasrc2src('#acl-list-content .list-group-item img[data-src]');
that.info.hide(); //hide acl-info
that.update_select('custom');
+ if(typeof value === 'undefined') {
+ value = 'custom';
+ }
/* jot acl */
if(that.allow_gid.length === 0 && that.allow_cid.length === 0 && that.deny_gid.length === 0 && that.deny_cid.length === 0 && value === 'custom') {
@@ -334,7 +338,7 @@ ACL.prototype.update_view = function(value) {
$("#acl-list-content .acl-list-item").each(function() {
itemid = $(this).attr('id');
type = itemid[0];
- id = itemid.substr(1);
+ id = decodeURIComponent(itemid.substr(1));
btshow = $(this).children(".acl-button-show").removeClass("btn-success").addClass("btn-outline-success");
bthide = $(this).children(".acl-button-hide").removeClass("btn-danger").addClass("btn-outline-danger");