diff options
| author | friendica <info@friendica.com> | 2015-03-09 15:24:25 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-03-09 15:24:25 -0700 |
| commit | 97df5f1fd193aab92836ef3f9dd854406697b765 (patch) | |
| tree | 20d8e00f20f65162cfe361ea65574b396cfebb40 | |
| parent | 16bcca6aab0267fb36ad95ca0ee5d1bd14e0ec37 (diff) | |
| parent | 73fdb760c1e87630713494179cc547916696746a (diff) | |
| download | volse-hubzilla-97df5f1fd193aab92836ef3f9dd854406697b765.tar.gz volse-hubzilla-97df5f1fd193aab92836ef3f9dd854406697b765.tar.bz2 volse-hubzilla-97df5f1fd193aab92836ef3f9dd854406697b765.zip | |
Merge https://github.com/friendica/red into pending_merge
| -rw-r--r-- | view/js/acl.js | 5 | ||||
| -rw-r--r-- | view/js/mod_settings.js | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/view/js/acl.js b/view/js/acl.js index 77c65e21d..152ff6490 100644 --- a/view/js/acl.js +++ b/view/js/acl.js @@ -54,9 +54,12 @@ ACL.prototype.on_submit = function(){ }); $(that.deny_cid).each(function(i,v){ aclfileds.append("<input type='hidden' name='contact_deny[]' value='"+v+"'>"); - }); + }); // alert(aclfileds); + //areYouSure jquery plugin: recheck the form here + $('form').trigger('checkform.areYouSure'); + } ACL.prototype.search = function(){ diff --git a/view/js/mod_settings.js b/view/js/mod_settings.js index 5e52d56ab..e144ed6cd 100644 --- a/view/js/mod_settings.js +++ b/view/js/mod_settings.js @@ -2,7 +2,7 @@ var ispublic = aStr['everybody'] ; $(document).ready(function() { - $('form').areYouSure(); // Warn user about unsaved settings + $('form').areYouSure({'addRemoveFieldsMarksDirty':true}); // Warn user about unsaved settings $("#id_permissions_role").change(function() { var role = $("#id_permissions_role").val(); |