diff options
| author | Chris Case <kahotep@bunda.dreamhost.com> | 2011-02-14 11:50:08 -0800 |
|---|---|---|
| committer | Chris Case <kahotep@bunda.dreamhost.com> | 2011-02-14 11:50:08 -0800 |
| commit | 7b265005107f12fa1e5768853e280a8f0b68eeac (patch) | |
| tree | 8d178994704419c8f9b93289913af92a61caa2e8 /include | |
| parent | 42eb6dd723abd31aaaf6c1608f2dec645f4e20b5 (diff) | |
| parent | fe1a37074af43f17aac5859b1aaf37fde4b58ae9 (diff) | |
| download | volse-hubzilla-7b265005107f12fa1e5768853e280a8f0b68eeac.tar.gz volse-hubzilla-7b265005107f12fa1e5768853e280a8f0b68eeac.tar.bz2 volse-hubzilla-7b265005107f12fa1e5768853e280a8f0b68eeac.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'include')
| -rw-r--r-- | include/acl_selectors.php | 2 | ||||
| -rw-r--r-- | include/main.js | 21 |
2 files changed, 23 insertions, 0 deletions
diff --git a/include/acl_selectors.php b/include/acl_selectors.php index 953243a43..94f51a9ff 100644 --- a/include/acl_selectors.php +++ b/include/acl_selectors.php @@ -44,6 +44,8 @@ function group_select($selname,$selclass,$preselected = false,$size = 4) { function contact_select($selname, $selclass, $preselected = false, $size = 4, $privmail = false, $celeb = false, $privatenet = false) { + $a = get_app(); + $o = ''; // When used for private messages, we limit correspondence to mutual friends and the selector diff --git a/include/main.js b/include/main.js index 63b34bd21..abd097e54 100644 --- a/include/main.js +++ b/include/main.js @@ -29,6 +29,7 @@ $(document).ready(function() { $.ajaxSetup({cache: false}); + msie = $.browser.msie ; NavUpdate(); // Allow folks to stop the ajax page updates with the pause/break key @@ -210,3 +211,23 @@ $('#panel').hide(); } + function post_comment(id) { + $.post( + "item", + $("#comment-edit-form-" + id).serialize(), + function(data) { + if(data.success) { + $("#comment-edit-wrapper-" + id).hide(); + $("#comment-edit-text-" + id).val(''); + var tarea = document.getElementById("comment-edit-text-" + id); + if(tarea) + commentClose(tarea,id); + if(timer) clearTimeout(timer); + timer = setTimeout(NavUpdate,10); + } + }, + "json" + ); + return false; + } + |