diff options
| author | Olivier van Helden <olivier@van-helden.net> | 2014-12-03 17:54:07 -0400 |
|---|---|---|
| committer | Olivier van Helden <olivier@van-helden.net> | 2014-12-03 17:54:07 -0400 |
| commit | e523061b7261439a71bdacf8f46d4c614740b356 (patch) | |
| tree | 1a0577c64197c4289ed154d2c2d5fdf48a7e5192 /view/js/acl.js | |
| parent | 13fd91d6f5723774a1b96257f8096acb2873b4ed (diff) | |
| parent | b71b45aafc618d32d23c099a4d4db8bad2f09e54 (diff) | |
| download | volse-hubzilla-e523061b7261439a71bdacf8f46d4c614740b356.tar.gz volse-hubzilla-e523061b7261439a71bdacf8f46d4c614740b356.tar.bz2 volse-hubzilla-e523061b7261439a71bdacf8f46d4c614740b356.zip | |
Merge pull request #1 from friendica/master
Merge master from friendica
Diffstat (limited to 'view/js/acl.js')
| -rw-r--r-- | view/js/acl.js | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/view/js/acl.js b/view/js/acl.js index c129634a0..f9428e1c5 100644 --- a/view/js/acl.js +++ b/view/js/acl.js @@ -17,20 +17,24 @@ function ACL(backend_url, preset){ that.item_tpl = unescape($(".acl-list-item[rel=acl-template]").html()); that.showall = $("#acl-showall"); + // set the initial ACL lists in case the enclosing form gets submitted before the ajax loader completes. + that.on_submit(); + if (preset.length==0) that.showall.removeClass("btn-default").addClass("btn-warning"); /*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); -// $("#acl-wrapper").parents("form").submit(that.on_submit); +// 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 ); }); } |