Don't nest YouTube replies

iv-org · Oct 22, 2018 · 81ea2bf · 81ea2bf
1 parent ed3d9ce
commit 81ea2bf
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/src/invidious/comments.cr b/src/invidious/comments.cr
@@ -129,7 +129,7 @@ def template_youtube_comments(comments)
       <div class="pure-u-1">
         <p>
           <a href="javascript:void(0)" data-continuation="#{comments["continuation"]}"
-            onclick="get_youtube_replies(this)">Load more</a>
+            onclick="get_youtube_replies(this, true)">Load more</a>
         </p>
       </div>
     </div>

diff --git a/src/invidious/views/watch.ecr b/src/invidious/views/watch.ecr
@@ -379,7 +379,7 @@ function get_youtube_comments() {
   };
 }
 
-function get_youtube_replies(target) {
+function get_youtube_replies(target, load_more) {
   var continuation = target.getAttribute('data-continuation');
 
   var body = target.parentNode.parentNode;
@@ -398,13 +398,19 @@ function get_youtube_replies(target) {
   xhr.onreadystatechange = function() {
     if (xhr.readyState == 4) {
       if (xhr.status == 200) {
-        body.innerHTML = ' \
-            <p><a href="javascript:void(0)" \
-                onclick="hide_youtube_replies(this)">Hide replies \
-            </a></p> \
-            <div>{contentHtml}</div>'.supplant({
-            contentHtml: xhr.response.contentHtml,
-        });
+        if (load_more) {
+            body = body.parentNode.parentNode;
+            body.removeChild(body.lastElementChild);
+            body.innerHTML += xhr.response.contentHtml;
+        } else {
+            body.innerHTML = ' \
+                <p><a href="javascript:void(0)" \
+                    onclick="hide_youtube_replies(this)">Hide replies \
+                </a></p> \
+                <div>{contentHtml}</div>'.supplant({
+                contentHtml: xhr.response.contentHtml,
+            });
+        }
       } else {
         body.innerHTML = fallback;
       }