aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-03-11 20:17:14 -0700
committerfriendica <info@friendica.com>2014-03-11 20:17:14 -0700
commitd7dcf463ed887951930a1fb5b0360406542dedd7 (patch)
tree185988d29a850f978b5e5bcee291f491f4a6211d
parent5e41ef921999e1dc4d29101d4d764db967e257ee (diff)
downloadvolse-hubzilla-d7dcf463ed887951930a1fb5b0360406542dedd7.tar.gz
volse-hubzilla-d7dcf463ed887951930a1fb5b0360406542dedd7.tar.bz2
volse-hubzilla-d7dcf463ed887951930a1fb5b0360406542dedd7.zip
update acl internal list whenever there is a change - the submit handler seems to be unreliable or is getting into a race condition.
-rw-r--r--view/js/acl.js30
1 files changed, 20 insertions, 10 deletions
diff --git a/view/js/acl.js b/view/js/acl.js
index 84b080de2..6c3d9b462 100644
--- a/view/js/acl.js
+++ b/view/js/acl.js
@@ -20,16 +20,23 @@ function ACL(backend_url, preset){
if (preset.length==0) that.showall.addClass("selected");
/*events*/
- that.showall.click(that.on_showall);
- $(document).on('click','.acl-button-show',that.on_button_show);
- $(document).on('click','.acl-button-hide',that.on_button_hide);
- $("#acl-search").keypress(that.on_search);
- $("#acl-wrapper").parents("form").submit(that.on_submit);
-
- /* startup! */
- that.get(0,100);
+
+ $(document).ready(function() {
+ that.showall.click(that.on_showall);
+ $(document).on('click','.acl-button-show',that.on_button_show);
+ $(document).on('click','.acl-button-hide',that.on_button_hide);
+ $("#acl-search").keypress(that.on_search);
+// $("#acl-wrapper").parents("form").submit(that.on_submit);
+
+ /* startup! */
+ that.get(0,100);
+ that.on_submit();
+ });
+
}
+// no longer called on submit - call to update whenever a change occurs to the acl list.
+
ACL.prototype.on_submit = function(){
aclfileds = $("#acl-fields").html("");
$(that.allow_gid).each(function(i,v){
@@ -44,6 +51,8 @@ ACL.prototype.on_submit = function(){
$(that.deny_cid).each(function(i,v){
aclfileds.append("<input type='hidden' name='contact_deny[]' value='"+v+"'>");
});
+// alert(aclfileds);
+
}
ACL.prototype.search = function(){
@@ -72,6 +81,7 @@ ACL.prototype.on_showall = function(event){
that.deny_gid = [];
that.update_view();
+ that.on_submit();
return false;
}
@@ -86,7 +96,7 @@ ACL.prototype.on_button_show = function(event){
$(this).toggleClass("selected");*/
that.set_allow($(this).parent().attr('id'));
-
+ that.on_submit();
return false;
}
ACL.prototype.on_button_hide = function(event){
@@ -99,7 +109,7 @@ ACL.prototype.on_button_hide = function(event){
$(this).toggleClass("selected");*/
that.set_deny($(this).parent().attr('id'));
-
+ that.on_submit();
return false;
}