aboutsummaryrefslogtreecommitdiffstats
path: root/view/js
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-01-01 22:33:28 -0800
committerfriendica <info@friendica.com>2015-01-01 22:33:28 -0800
commit82d0a4af452015e870bdcea56f1008ea22d066b3 (patch)
tree3ad1db1aeb0dfdeb10a70b99da353fe3094f1d69 /view/js
parent9a34e18319301e0a952f674899aeb58b424637a4 (diff)
parent68c612c597471404201099ecbc8b4082d152e18a (diff)
downloadvolse-hubzilla-82d0a4af452015e870bdcea56f1008ea22d066b3.tar.gz
volse-hubzilla-82d0a4af452015e870bdcea56f1008ea22d066b3.tar.bz2
volse-hubzilla-82d0a4af452015e870bdcea56f1008ea22d066b3.zip
Merge branch 'master' into trinidad
Diffstat (limited to 'view/js')
-rw-r--r--view/js/mod_admin.js3
-rw-r--r--view/js/mod_new_channel.js2
-rw-r--r--view/js/mod_profiles.js3
-rw-r--r--view/js/mod_settings.js5
4 files changed, 10 insertions, 3 deletions
diff --git a/view/js/mod_admin.js b/view/js/mod_admin.js
new file mode 100644
index 000000000..aad2ca902
--- /dev/null
+++ b/view/js/mod_admin.js
@@ -0,0 +1,3 @@
+$(document).ready(function() {
+ $('form').areYouSure(); // Warn user about unsaved settings
+});
diff --git a/view/js/mod_new_channel.js b/view/js/mod_new_channel.js
index 492267ff9..c4d5408f2 100644
--- a/view/js/mod_new_channel.js
+++ b/view/js/mod_new_channel.js
@@ -1,5 +1,5 @@
$(document).ready(function() {
-// $("#privacy-role-select").sSelect();
+// $("#id_permissions_role").sSelect();
$("#newchannel-name").blur(function() {
$("#name-spinner").spin('small');
var zreg_name = $("#newchannel-name").val();
diff --git a/view/js/mod_profiles.js b/view/js/mod_profiles.js
new file mode 100644
index 000000000..aad2ca902
--- /dev/null
+++ b/view/js/mod_profiles.js
@@ -0,0 +1,3 @@
+$(document).ready(function() {
+ $('form').areYouSure(); // Warn user about unsaved settings
+});
diff --git a/view/js/mod_settings.js b/view/js/mod_settings.js
index 87c8c3a2b..0db0dd165 100644
--- a/view/js/mod_settings.js
+++ b/view/js/mod_settings.js
@@ -2,14 +2,15 @@
var ispublic = aStr['everybody'] ;
$(document).ready(function() {
+ $('form').areYouSure(); // Warn user about unsaved settings
$("a#settings-default-perms-menu").colorbox({
'inline' : true,
'transition' : 'elastic'
});
- $("#privacy-role-select").change(function() {
- var role = $("#privacy-role-select").val();
+ $("#id_permissions_role").change(function() {
+ var role = $("#id_permissions_role").val();
if(role == 'custom')
$('#advanced-perm').show();
else