Lanmikeman/openvk
Lanmikeman/openvk
1
1
Fork 0
mirror of https://github.com/openvk/openvk synced 2024-12-22 16:42:32 +03:00
Code Issues Projects Releases Packages Wiki Activity

add posts scrolling function and ability to disabl

Browse source
This commit is contained in:
mrilyew 2024-11-17 16:08:15 +03:00
parent e3b5d60f89
commit c77a6cc54f
14 changed files with 50 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Web/Models/Repositories/Posts.php
View file

@ -53,9 +53,9 @@ class Posts
$offset--;
}
}
} else if(!is_null($offset)) {
} /*else if(!is_null($offset)) {
$offset--;
}
}*/
$sel = $this->posts->where([
"wall" => $user,

1
Web/Presenters/templates/@layout.xml
View file

@ -391,6 +391,7 @@
{script "js/al_polls.js"}
{script "js/al_suggestions.js"}
{script "js/al_navigation.js"}
{script "js/al_comments.js"}
{ifset $thisUser}
{script "js/al_notifs.js"}

2
Web/Presenters/templates/Search/Index.xml
View file

@ -29,7 +29,7 @@
</div>
<div class='page_wrap_content' id='search_page'>
<div n:class='page_wrap_content_main, $section != "posts" ? scroll_container, $section == "audios" && $count > 0 ? audios_padding'>
<div n:class='page_wrap_content_main, scroll_container, $section == "audios" && $count > 0 ? audios_padding'>
{if $count > 0}
{if $section === 'users'}
<div class='scroll_node search_content content def_row_content' n:foreach="$data as $dat">

4
Web/Presenters/templates/User/Groups.xml
View file

@ -122,8 +122,8 @@
<h4>{_search_group}</h4>
<span>{_search_group_desc}</span>
<form action="/search">
<input name="type" type="hidden" value="groups">
<input name="query" class="header_search_input" value="" style="background: none; width: 155px; padding-left: 3px;">
<input name="section" type="hidden" value="groups">
<input name="q" class="header_search_input" value="" style="background: none; width: 155px; padding-left: 3px;">
<button class="button">{_search_by_groups}</button>
</form>
</div>

10
Web/Presenters/templates/Wall/Feed.xml
View file

@ -23,10 +23,12 @@
{include "../components/textArea.xml", route => "/wall" . $thisUser->getId() . "/makePost", graffiti => true, polls => true, notes => true, hasSource => true}
</div>
{foreach $posts as $post}
<a name="postGarter={$post->getId()}"></a>
{include "../components/post.xml", post => $post, onWallOf => true, commentSection => true}
{/foreach}
<div class='scroll_container'>
<div class='scroll_node' n:foreach='$posts as $post'>
<a name="postGarter={$post->getId()}"></a>
{include "../components/post.xml", post => $post, onWallOf => true, commentSection => true}
</div>
</div>
<div class="postFeedBottom">
<div class="postFeedPaginator">

6
Web/Presenters/templates/Wall/Wall.xml
View file

@ -31,13 +31,13 @@
{include "../components/textArea.xml", route => "/wall$owner/makePost", hasSource => true}
</div>
<div class="content">
<div class="content scroll_container">
{if sizeof($posts) > 0}
{foreach $posts as $post}
<div class='scroll_node' n:foreach='$posts as $post'>
<a name="postGarter={$post->getId()}"></a>
{include "../components/post.xml", post => $post, commentSection => true}
{/foreach}
</div>
{include "../components/paginator.xml", conf => $paginatorConf}
{else}
{_no_posts_abstract}

2
Web/Presenters/templates/components/comments.xml
View file

@ -20,5 +20,3 @@
{else}
{_comments_tip}
{/if}
{script "js/al_comments.js"}

6
Web/Presenters/templates/components/wall.xml
View file

@ -13,13 +13,13 @@
{include "../components/textArea.xml", route => "/wall$owner/makePost", graffiti => true, polls => true, notes => true, hasSource => true}
</div>
<div class="content">
<div class="content scroll_container">
{if sizeof($posts) > 0}
{foreach $posts as $post}
<div class='scroll_node' n:foreach='$posts as $post'>
<a name="postGarter={$post->getId()}"></a>
{include "../components/post.xml", post => $post, commentSection => true}
{/foreach}
</div>
{include "../components/paginator.xml", conf => $paginatorConf}
{else}
{_no_posts_abstract}

4
Web/static/js/al_comments.js
View file

@ -8,6 +8,8 @@ u(document).on("click", ".comment-reply", function(e) {
let mention = ("[" + (fromGroup ? "club" : "id") + authorId + "|" + authorNm + "], ");
// Substitute pervious mention if present, prepend otherwise
inputbox.nodes[0].value = inputbox.nodes[0].value.replace(/(^\[([A-Za-z0-9]+)\|([\p{L} 0-9@]+)\], |^)/u, mention);
inputbox.nodes.forEach(node => {
node.value = node.value.replace(/(^\[([A-Za-z0-9]+)\|([\p{L} 0-9@]+)\], |^)/u, mention);
})
inputbox.trigger("focusin");
});

19
Web/static/js/al_feed.js
View file

@ -84,6 +84,7 @@ u(document).on('click', '#__feed_settings_link', (e) => {
const CURRENT_PERPAGE = Number(__temp_url.searchParams.get('posts') ?? 10)
const CURRENT_PAGE = Number(__temp_url.searchParams.get('p') ?? 1)
const CURRENT_RETURN_BANNED = Number(__temp_url.searchParams.get('return_banned') ?? 0)
const CURRENT_AUTO_SCROLL = Number(localStorage.getItem('ux.auto_scroll') ?? 1)
const COUNT = [1, 5, 10, 20, 30, 40, 50]
u('#_feed_settings_container #__content').html(`
<table cellspacing="7" cellpadding="0" border="0" align="center">
@ -107,11 +108,21 @@ u(document).on('click', '#__feed_settings_link', (e) => {
<tr>
<td width="120" valign="top">
<span class="nobold">
<input type='checkbox' id="showIgnored" ${CURRENT_RETURN_BANNED == 1 ? 'checked' : ''}>
<input type='checkbox' name='showIgnored' id="showIgnored" ${CURRENT_RETURN_BANNED == 1 ? 'checked' : ''}>
</span>
</td>
<td>
${tr('show_ignored_sources')}
<label for='showIgnored'>${tr('show_ignored_sources')}</label>
</td>
</tr>
<tr>
<td width="120" valign="top">
<span class="nobold">
<input type='checkbox' data-act='localstorage_item' name='ux.auto_scroll' id="ux.auto_scroll" ${CURRENT_AUTO_SCROLL == 1 ? 'checked' : ''}>
</span>
</td>
<td>
<label for='ux.auto_scroll'>${tr('auto_scroll')}</label>
</td>
</tr>
<tr>
@ -268,3 +279,7 @@ u(document).on('click', '#__feed_settings_link', (e) => {
__switchTab('main')
})
u(document).on('change', `input[data-act='localstorage_item']`, (e) => {
localStorage.setItem(e.target.name, Number(e.target.checked))
})

3
Web/static/js/al_mentions.js
View file

@ -19,7 +19,8 @@ var tooltipTemplate = Handlebars.compile(`
</table>
`);
tippy(".mention", {
tippy.delegate("body", {
target: '.mention',
theme: "light vk",
content: "⌛",
allowHTML: true,

9
Web/static/js/al_wall.js
View file

@ -399,6 +399,7 @@ async function OpenVideo(video_arr = [], init_player = true)
details.find('.media-page-wrapper-description b').remove()
u('#ovk-player-info').html(details.html())
bsdnHydrate()
}
})
@ -542,7 +543,8 @@ var tooltipClientNoInfoTemplate = Handlebars.compile(`
</table>
`);
tippy(".client_app", {
tippy.delegate("body", {
target: '.client_app',
theme: "light vk",
content: "⌛",
allowHTML: true,
@ -2039,6 +2041,10 @@ async function __processPaginatorNextPage(page)
const showMoreObserver = new IntersectionObserver(entries => {
entries.forEach(async x => {
if(x.isIntersecting) {
if(Number(localStorage.getItem('ux.auto_scroll') ?? 1) == 0) {
return
}
if(u('.scroll_container').length < 1) {
return
}
@ -2063,6 +2069,7 @@ const showMoreObserver = new IntersectionObserver(entries => {
const page_number = Number(next_page.html())
await __processPaginatorNextPage(page_number)
bsdnHydrate()
u('.paginator:not(.paginator-at-top)').removeClass('lagged')
}
})

1
locales/en.strings
View file

@ -220,6 +220,7 @@
"all_news" = "All news";
"posts_per_page" = "Number of posts per page";
"show_ignored_sources" = "Show ignored sources";
"auto_scroll" = "Autoscroll";
"attachment" = "Attachment";
"post_as_group" = "Post as group";

1
locales/ru.strings
View file

@ -205,6 +205,7 @@
"all_news" = "Все новости";
"posts_per_page" = "Количество записей на странице";
"show_ignored_sources" = "Показывать игнорируемые источники";
"auto_scroll" = "Автоматическая прокрутка";
"attachment" = "Вложение";
"post_as_group" = "От имени сообщества";
"comment_as_group" = "От имени сообщества";