harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

process follow from article menu in the background, do not reload page - hubzilla issue #987

Browse Source
This commit is contained in:
zotlabs 2018-03-02 13:15:28 -08:00 committed by Mario Vavti
parent 726576363c
commit c8afde6f87
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/conversation.php
View File

@ -1005,7 +1005,7 @@ function thread_author_menu($item, $mode = '') {
$contact = App::$contacts[$item['author_xchan']]; $contact = App::$contacts[$item['author_xchan']];
else else
if($local_channel && $item['author']['xchan_addr']) 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)) { if($item['uid'] > 0 && author_is_pmable($item['author'],$contact)) {
@ -1051,8 +1051,8 @@ function thread_author_menu($item, $mode = '') {
'menu' => 'follow', 'menu' => 'follow',
'title' => t('Connect'), 'title' => t('Connect'),
'icon' => 'fw', 'icon' => 'fw',
'action' => '', 'action' => 'doFollowAuthor(\'' . $follow_url . '\'); return false;',
'href' => $follow_url 'href' => '#',
]; ];
} }

6
view/js/main.js
View File

@ -304,6 +304,12 @@ function insertCommentURL(comment, id) {
return true; return true;
} }
function doFollowAuthor(url) {
$.get(url, function(data) { notificationsUpdate(); });
return true;
}
function viewsrc(id) { function viewsrc(id) {
$.colorbox({href: 'viewsrc/' + id, maxWidth: '80%', maxHeight: '80%' }); $.colorbox({href: 'viewsrc/' + id, maxWidth: '80%', maxHeight: '80%' });
} }