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

Merge branch 'dev' into 'dev'

Browse Source 
Threaded comments usability imrovements

See merge request hubzilla/core!1633
This commit is contained in:
Max Kostikov 2019-05-05 18:15:58 +02:00
commit 9b947c8370
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Zotlabs/Lib/ThreadItem.php
View File

@ -306,7 +306,7 @@ class ThreadItem {
if($this->is_commentable() && $observer) { if($this->is_commentable() && $observer) {
$like = array( t("I like this \x28toggle\x29"), t("like")); $like = array( t("I like this \x28toggle\x29"), t("like"));
$dislike = array( t("I don't like this \x28toggle\x29"), t("dislike")); $dislike = array( t("I don't like this \x28toggle\x29"), t("dislike"));
$reply_to = array( t("Reply on this comment"), t("reply"), t("Reply to"), t("Go to previous comment")); $reply_to = array( t("Reply on this comment"), t("reply"), t("Reply to"));
} }
if ($shareable) { if ($shareable) {
@ -428,6 +428,7 @@ class ThreadItem {
'like' => $like, 'like' => $like,
'dislike' => ((feature_enabled($conv->get_profile_owner(),'dislike')) ? $dislike : ''), 'dislike' => ((feature_enabled($conv->get_profile_owner(),'dislike')) ? $dislike : ''),
'reply_to' => (((! $this->is_toplevel()) && feature_enabled($conv->get_profile_owner(),'reply_to')) ? $reply_to : ''), 'reply_to' => (((! $this->is_toplevel()) && feature_enabled($conv->get_profile_owner(),'reply_to')) ? $reply_to : ''),
'top_hint' => t("Go to previous comment"),
'share' => $share, 'share' => $share,
'embed' => $embed, 'embed' => $embed,
'rawmid' => $item['mid'], 'rawmid' => $item['mid'],

10
view/js/main.js
View File

@ -1160,8 +1160,14 @@ function doreply(parent, ident, owner, hint) {
} }
function doscroll(parent, hidden) { function doscroll(parent, hidden) {
$('.back-to-reply').remove(); var back = $('.back-to-reply');
var pos = $(window).scrollTop(); if(back.length == 0) {
var pos = Math.round($(window).scrollTop());
}
else {
var pos = back.attr('href').replace(/\D/g,'')
}
back.remove();
var x = '#hide-comments-outer-' + hidden.toString(); var x = '#hide-comments-outer-' + hidden.toString();
if($(x).length !== 0) { if($(x).length !== 0) {
x = $(x).attr("onclick").replace(/\D/g,''); x = $(x).attr("onclick").replace(/\D/g,'');

2
view/tpl/conv_item.tpl
View File

@ -28,7 +28,7 @@
{{/if}} {{/if}}
<div class="p-2 clearfix wall-item-head{{if $item.is_new && !$item.title && !$item.event && !$item.is_comment && !$item.photo}} wall-item-head-new rounded-top{{/if}}" > <div class="p-2 clearfix wall-item-head{{if $item.is_new && !$item.title && !$item.event && !$item.is_comment && !$item.photo}} wall-item-head-new rounded-top{{/if}}" >
{{if $item.thr_parent}} {{if $item.thr_parent}}
<a href="javascript:doscroll('{{$item.thr_parent}}',{{$item.parent}});" title="{{$item.reply_to.3}}"><i class="fa fa-angle-double-up float-right">&nbsp;&nbsp;&nbsp;</i></a> <a href="javascript:doscroll('{{$item.thr_parent}}',{{$item.parent}});" title="{{$item.top_hint}}"><i class="fa fa-angle-double-up float-right">&nbsp;&nbsp;&nbsp;</i></a>
{{/if}} {{/if}}
<div class="wall-item-info" id="wall-item-info-{{$item.id}}" > <div class="wall-item-info" id="wall-item-info-{{$item.id}}" >
<div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}} h-card p-author" id="wall-item-photo-wrapper-{{$item.id}}"> <div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}} h-card p-author" id="wall-item-photo-wrapper-{{$item.id}}">