aboutsummaryrefslogtreecommitdiffstats
path: root/view/js/acl.js
diff options
context:
space:
mode:
authorHabeas Codice <habeascodice@federated.social>2014-11-17 03:20:20 -0800
committerHabeas Codice <habeascodice@federated.social>2014-11-17 03:20:20 -0800
commit333f3b17152475e780cc5a9fbedaf3b03dfb2cce (patch)
tree8aaa0a8cd7ddc00630c38a85121124e824e35e7b /view/js/acl.js
parent2dbecf95454993cdf4996d2d65463d7759cd479b (diff)
parentb11ed7f88e4683315a4f5aa02692cb61facf32a7 (diff)
downloadvolse-hubzilla-333f3b17152475e780cc5a9fbedaf3b03dfb2cce.tar.gz
volse-hubzilla-333f3b17152475e780cc5a9fbedaf3b03dfb2cce.tar.bz2
volse-hubzilla-333f3b17152475e780cc5a9fbedaf3b03dfb2cce.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'view/js/acl.js')
-rw-r--r--view/js/acl.js16
1 files changed, 9 insertions, 7 deletions
diff --git a/view/js/acl.js b/view/js/acl.js
index eb702d2b0..f9fd66bab 100644
--- a/view/js/acl.js
+++ b/view/js/acl.js
@@ -25,14 +25,16 @@ function ACL(backend_url, preset){
/*events*/
$(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);
+// setTimeout( 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);
- /* startup! */
- that.get(0,100);
- that.on_submit();
+ /* startup! */
+ that.get(0,100);
+ that.on_submit();
+// }, 5000 );
});
}