diff options
| author | habeascodice <habeascodice@federated.social> | 2014-10-29 03:39:07 -0700 |
|---|---|---|
| committer | habeascodice <habeascodice@federated.social> | 2014-10-29 03:39:07 -0700 |
| commit | bc02b933727da7a000d43d2d7d495f066616dc81 (patch) | |
| tree | e590b70757edb94655872f5b992f143cead61eb3 /view/js | |
| parent | fc12123329133cea39f27615a7c24c57e5b4a35d (diff) | |
| parent | 7d9f785758ee6e4c19838e532f9930e227e95fc6 (diff) | |
| download | volse-hubzilla-bc02b933727da7a000d43d2d7d495f066616dc81.tar.gz volse-hubzilla-bc02b933727da7a000d43d2d7d495f066616dc81.tar.bz2 volse-hubzilla-bc02b933727da7a000d43d2d7d495f066616dc81.zip | |
Merge remote branch 'upstream/master'
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; |