diff options
Diffstat (limited to 'view/js')
| -rw-r--r-- | view/js/acl.js | 30 | ||||
| -rw-r--r-- | view/js/mod_filestorage.js (renamed from view/js/mod_filestorage.php) | 0 | ||||
| -rw-r--r-- | view/js/mod_photos.js | 13 |
3 files changed, 29 insertions, 14 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; } diff --git a/view/js/mod_filestorage.php b/view/js/mod_filestorage.js index 82957ae44..82957ae44 100644 --- a/view/js/mod_filestorage.php +++ b/view/js/mod_filestorage.js diff --git a/view/js/mod_photos.js b/view/js/mod_photos.js index c9d13f742..d9497af1e 100644 --- a/view/js/mod_photos.js +++ b/view/js/mod_photos.js @@ -3,10 +3,15 @@ var ispublic = aStr['everybody']; $(document).ready(function() { - $("a#settings-default-perms-menu").colorbox({ - 'inline' : true, - 'transition' : 'elastic' - }); + $("a#photos-upload-perms-menu").colorbox({ + 'inline' : true, + 'transition' : 'elastic' + }); + + $("a#settings-default-perms-menu").colorbox({ + 'inline' : true, + 'transition' : 'elastic' + }); $('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() { var selstr; |