aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-08-15 22:46:06 -0700
committerredmatrix <git@macgirvin.com>2016-08-15 22:46:06 -0700
commit70150718c55ec5b55dbded26a5159f06f14c6c25 (patch)
tree3e42b4716ea89d4469c4e8d5a20f85303baecbc1
parent8a89cfb158986dd6be4c820188326f10f0bc1a94 (diff)
parent86d2daf473f026ce5fde9d2a7fa893ba365ce58f (diff)
downloadvolse-hubzilla-70150718c55ec5b55dbded26a5159f06f14c6c25.tar.gz
volse-hubzilla-70150718c55ec5b55dbded26a5159f06f14c6c25.tar.bz2
volse-hubzilla-70150718c55ec5b55dbded26a5159f06f14c6c25.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
-rw-r--r--view/js/mod_settings.js15
1 files changed, 1 insertions, 14 deletions
diff --git a/view/js/mod_settings.js b/view/js/mod_settings.js
index 0f45e0d16..4ff702b22 100644
--- a/view/js/mod_settings.js
+++ b/view/js/mod_settings.js
@@ -3,7 +3,7 @@
*/
$(document).ready(function() {
- $('form').areYouSure({'addRemoveFieldsMarksDirty':true, 'message': aStr['leavethispage'] }); // Warn user about unsaved settings
+ $('#settings-form').areYouSure({'addRemoveFieldsMarksDirty':true, 'message': aStr['leavethispage'] }); // Warn user about unsaved settings
$('.token-mirror').html($('#id_token').val());
$('#id_token').keyup( function() { $('.token-mirror').html($('#id_token').val()); });
@@ -15,19 +15,6 @@ $(document).ready(function() {
else
$('#advanced-perm').hide();
});
-
- $('#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() {
- selstr = $(this).text();
- $('#jot-perms-icon').removeClass('fa-unlock').addClass('fa-lock');
- $('#jot-public').hide();
- });
- if(selstr === null) {
- $('#jot-perms-icon').removeClass('fa-lock').addClass('fa-unlock');
- $('#jot-public').show();
- }
- }).trigger('change');
});
/**