diff options
| author | Stefan Parviainen <saparvia@caterva.eu> | 2014-11-08 20:53:41 +0100 |
|---|---|---|
| committer | Stefan Parviainen <saparvia@caterva.eu> | 2014-11-08 20:53:41 +0100 |
| commit | b5fad9feefd0f261807222d8a4c42ead6253a65c (patch) | |
| tree | 399cd4a1b79f61530924ea59670af0bdd6cee5be /view/js | |
| parent | 89aea081825ec7b11b00833a9bec2c74900bfcb6 (diff) | |
| parent | b29a968be8df52cd7c9b6d5bebb618534788337c (diff) | |
| download | volse-hubzilla-b5fad9feefd0f261807222d8a4c42ead6253a65c.tar.gz volse-hubzilla-b5fad9feefd0f261807222d8a4c42ead6253a65c.tar.bz2 volse-hubzilla-b5fad9feefd0f261807222d8a4c42ead6253a65c.zip | |
Fix merge conflict
Diffstat (limited to 'view/js')
| -rw-r--r-- | view/js/main.js | 2 | ||||
| -rw-r--r-- | view/js/mod_photos.js | 13 | ||||
| -rw-r--r-- | view/js/mod_settings.js | 16 |
3 files changed, 26 insertions, 5 deletions
diff --git a/view/js/main.js b/view/js/main.js index 32db7ccb7..beedb7f01 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -575,7 +575,7 @@ function updateConvItems(mode,data) { } /* autocomplete @nicknames */ - $(".comment-edit-form textarea").contact_autocomplete(baseurl+"/acl"); + $(".comment-edit-form textarea").contact_autocomplete(baseurl+"/acl?f=&n=1"); var bimgs = $(".wall-item-body img").not(function() { return this.complete; }); var bimgcount = bimgs.length; diff --git a/view/js/mod_photos.js b/view/js/mod_photos.js index aaa86df40..8b7706f16 100644 --- a/view/js/mod_photos.js +++ b/view/js/mod_photos.js @@ -13,6 +13,19 @@ $(document).ready(function() { 'transition' : 'elastic' }); + var a; + a = $("#photo-edit-newtag").autocomplete({ + serviceUrl: baseurl + '/acl', + minChars: 2, + width: 250, + id: 'newtag-ac', + onSelect: function(value,data) { + $("#photo-edit-newtag").val(data); + }, + }); + a.setOptions({ params: { type: 'p' }}); + + $('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() { var selstr; $('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() { diff --git a/view/js/mod_settings.js b/view/js/mod_settings.js index 77c9d0ced..87c8c3a2b 100644 --- a/view/js/mod_settings.js +++ b/view/js/mod_settings.js @@ -3,10 +3,18 @@ var ispublic = aStr['everybody'] ; $(document).ready(function() { - $("a#settings-default-perms-menu").colorbox({ - 'inline' : true, - 'transition' : 'elastic' - }); + $("a#settings-default-perms-menu").colorbox({ + 'inline' : true, + 'transition' : 'elastic' + }); + + $("#privacy-role-select").change(function() { + var role = $("#privacy-role-select").val(); + if(role == 'custom') + $('#advanced-perm').show(); + else + $('#advanced-perm').hide(); + }); $('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() { var selstr; |