Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
This commit is contained in:
commit
70150718c5
@ -3,7 +3,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
$(document).ready(function() {
|
$(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());
|
$('.token-mirror').html($('#id_token').val());
|
||||||
$('#id_token').keyup( function() { $('.token-mirror').html($('#id_token').val()); });
|
$('#id_token').keyup( function() { $('.token-mirror').html($('#id_token').val()); });
|
||||||
@ -15,19 +15,6 @@ $(document).ready(function() {
|
|||||||
else
|
else
|
||||||
$('#advanced-perm').hide();
|
$('#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');
|
|
||||||
});
|
});
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Reference in New Issue
Block a user