diff --git a/files/assets/js/comments_v.js b/files/assets/js/comments_v.js index ece34fe72..5f5ba4074 100644 --- a/files/assets/js/comments_v.js +++ b/files/assets/js/comments_v.js @@ -201,7 +201,7 @@ function comment_edit(id){ xhr.send(form) } -function post_comment(fullname){ +function post_comment(fullname, hide){ const btn = document.getElementById('save-reply-to-'+fullname) btn.disabled = true btn.classList.add('disabled'); @@ -227,19 +227,41 @@ function post_comment(fullname){ try {data = JSON.parse(xhr.response)} catch(e) {console.log(e)} if (data && data["comment"]) { - commentForm=document.getElementById('comment-form-space-'+fullname); - commentForm.innerHTML = data["comment"].replace(/data-src/g, 'src').replace(/data-cfsrc/g, 'src').replace(/style="display:none;visibility:hidden;"/g, ''); + console.log(hide) + document.getElementById(hide).classList.add('d-none'); + + let id = fullname.split('_')[1]; + let name = 'comment-form-space-' + fullname; + commentForm = document.getElementById(name); + + let comments = document.getElementById('replies-of-' + id); + let comment = data["comment"].replace(/data-src/g, 'src').replace(/data-cfsrc/g, 'src').replace(/style="display:none;visibility:hidden;"/g, ''); + + comments.innerHTML = comment + comments.innerHTML; + bs_trigger(commentForm); + + let placeholder = document.getElementById("placeholder-comment"); + if(placeholder){ + comments.classList.remove('text-center'); + comments.classList.remove('py-7'); + placeholder.parentNode.removeChild(placeholder); + } + + btn.disabled = false; + btn.classList.remove('disabled'); + + document.getElementById('reply-form-body-'+fullname).value = '' } else { if (data && data["error"]) document.getElementById('toast-post-error-text').innerText = data["error"]; else document.getElementById('toast-post-error-text').innerText = "Error, please try again later." bootstrap.Toast.getOrCreateInstance(document.getElementById('toast-post-error')).show(); + setTimeout(() => { + btn.disabled = false; + btn.classList.remove('disabled'); + }, 2000); } - setTimeout(() => { - btn.disabled = false; - btn.classList.remove('disabled'); - }, 2000); } xhr.send(form) } diff --git a/files/templates/comments.html b/files/templates/comments.html index 6578775e4..3dd4b1861 100644 --- a/files/templates/comments.html +++ b/files/templates/comments.html @@ -1,941 +1,943 @@ -{%- from 'util/assetcache.html' import asset, asset_siteimg with context -%} -{%- import 'util/helpers.html' as help -%} -{% if not ajax %} - {% if comment_info %} - - {% endif %} - - {% if v %} - {% include "award_modal.html" %} - {% endif %} - -
-{% endif %} - -{% macro single_comment(c, level=1) %} - -{% set ups=c.upvotes %} -{% set downs=c.downvotes %} -{% set score=ups-downs %} - -{% if render_replies %} - {% if v and (v.shadowbanned or v.admin_level >= 2) %} - {% set replies=c.replies3(sort) %} - {% else %} - {% set replies=c.replies(sort) %} - {% endif %} -{% endif %} - -{% if c.is_blocking or (c.is_banned or c.deleted_utc) and not (v and v.admin_level > 1) and not (v and v.id==c.author_id) %} - - -