diff options
| author | Christian Vogeley <christian.vogeley@hotmail.de> | 2013-12-22 14:31:27 +0100 |
|---|---|---|
| committer | Christian Vogeley <christian.vogeley@hotmail.de> | 2013-12-22 14:31:27 +0100 |
| commit | 870df76463a1cc9823b364db0bfb387f3f46664f (patch) | |
| tree | a8c7391bfe799703aa0a8f26b9ee788f1204e8be /view/js | |
| parent | 25a533bd72c34e9775af71c010a39db6caf7b633 (diff) | |
| parent | 7e7b5bfa4930493a8feae10b0550e29797956c70 (diff) | |
| download | volse-hubzilla-870df76463a1cc9823b364db0bfb387f3f46664f.tar.gz volse-hubzilla-870df76463a1cc9823b364db0bfb387f3f46664f.tar.bz2 volse-hubzilla-870df76463a1cc9823b364db0bfb387f3f46664f.zip | |
Merge remote-tracking branch 'upstream/master' into bootstrap
Conflicts:
view/php/theme_init.php
Diffstat (limited to 'view/js')
| -rw-r--r-- | view/js/mod_mail.js | 13 | ||||
| -rw-r--r-- | view/js/mod_mitem.js | 22 | ||||
| -rw-r--r-- | view/js/mod_poke.js | 2 | ||||
| -rw-r--r-- | view/js/mod_settings.js | 5 | ||||
| -rw-r--r-- | view/js/mod_sources.js | 4 |
5 files changed, 44 insertions, 2 deletions
diff --git a/view/js/mod_mail.js b/view/js/mod_mail.js new file mode 100644 index 000000000..82f60f46f --- /dev/null +++ b/view/js/mod_mail.js @@ -0,0 +1,13 @@ +$(document).ready(function() { + var a; + a = $("#recip").autocomplete({ + serviceUrl: baseurl + '/acl', + minChars: 2, + width: 250, + id: 'recip-ac', + onSelect: function(value,data) { + $("#recip-complete").val(data); + }, + }); + +}); diff --git a/view/js/mod_mitem.js b/view/js/mod_mitem.js new file mode 100644 index 000000000..d33713ee3 --- /dev/null +++ b/view/js/mod_mitem.js @@ -0,0 +1,22 @@ +$(document).ready(function() { + + $("a#settings-default-perms-menu").colorbox({ + 'inline' : true, + 'transition' : 'elastic' + }); + + + $('#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('unlock').addClass('lock'); + $('#jot-public').hide(); + }); + if(selstr == null) { + $('#jot-perms-icon').removeClass('lock').addClass('unlock'); + $('#jot-public').show(); + } + + }).trigger('change'); +}); diff --git a/view/js/mod_poke.js b/view/js/mod_poke.js index edd53bb6a..78972888f 100644 --- a/view/js/mod_poke.js +++ b/view/js/mod_poke.js @@ -4,7 +4,7 @@ $(document).ready(function() { serviceUrl: baseurl + '/acl', minChars: 2, width: 250, - id: 'poke-recip-ac'; + id: 'poke-recip-ac', onSelect: function(value,data) { $("#poke-recip-complete").val(data); } diff --git a/view/js/mod_settings.js b/view/js/mod_settings.js index e749cd761..7f9a9e960 100644 --- a/view/js/mod_settings.js +++ b/view/js/mod_settings.js @@ -3,6 +3,11 @@ var ispublic = aStr['everybody'] ; $(document).ready(function() { + $("a#settings-default-perms-menu").colorbox({ + 'inline' : true, + 'transition' : 'elastic' + }); + $('#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_sources.js b/view/js/mod_sources.js index fda952cae..49880b38f 100644 --- a/view/js/mod_sources.js +++ b/view/js/mod_sources.js @@ -6,8 +6,10 @@ $(document).ready(function() { width: 250, id: 'id-name-ac', onSelect: function(value,data) { - $("#id_xchan").val(data); + $("#id_abook").val(data); } }); + a.setOptions({ params: { type: 'a' }}); + }); |