aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2018-03-02 13:15:28 -0800
committerzotlabs <mike@macgirvin.com>2018-03-02 13:15:28 -0800
commitdf038055799d839aebab4e1a8b43fba81192c186 (patch)
tree5f9d86309f9ac6e51e995def46fca6ef1f793caf
parentb38ce967f36e0dc5a503fbca9477732cd8967ea6 (diff)
downloadvolse-hubzilla-df038055799d839aebab4e1a8b43fba81192c186.tar.gz
volse-hubzilla-df038055799d839aebab4e1a8b43fba81192c186.tar.bz2
volse-hubzilla-df038055799d839aebab4e1a8b43fba81192c186.zip
process follow from article menu in the background, do not reload page - hubzilla issue #987
-rw-r--r--include/conversation.php6
-rw-r--r--view/js/main.js6
2 files changed, 9 insertions, 3 deletions
diff --git a/include/conversation.php b/include/conversation.php
index 0bb9c769a..6374267eb 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1005,7 +1005,7 @@ function thread_author_menu($item, $mode = '') {
$contact = App::$contacts[$item['author_xchan']];
else
if($local_channel && $item['author']['xchan_addr'])
- $follow_url = z_root() . '/follow/?f=&url=' . urlencode($item['author']['xchan_addr']);
+ $follow_url = z_root() . '/follow/?f=&url=' . urlencode($item['author']['xchan_addr']) . '&interactive=0';
if($item['uid'] > 0 && author_is_pmable($item['author'],$contact)) {
@@ -1051,8 +1051,8 @@ function thread_author_menu($item, $mode = '') {
'menu' => 'follow',
'title' => t('Connect'),
'icon' => 'fw',
- 'action' => '',
- 'href' => $follow_url
+ 'action' => 'doFollowAuthor(\'' . $follow_url . '\'); return false;',
+ 'href' => '#',
];
}
diff --git a/view/js/main.js b/view/js/main.js
index f6fe475d8..98a756fff 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -304,6 +304,12 @@ function insertCommentURL(comment, id) {
return true;
}
+function doFollowAuthor(url) {
+ $.get(url, function(data) { notificationsUpdate(); });
+ return true;
+}
+
+
function viewsrc(id) {
$.colorbox({href: 'viewsrc/' + id, maxWidth: '80%', maxHeight: '80%' });
}