ticket #90 attempt 1

devplacepy/static/js/ModalManager.js

@@ -29,7 +29,6 @@ export class ModalManager {
                 const modal = document.getElementById(modalId);
                 if (modal) {
                     modal.classList.add("visible");
-                    window.history.pushState({__overlay: true}, "");
                 }
             });
         });
@@ -38,13 +37,11 @@ export class ModalManager {
             modal.addEventListener("click", (e) => {
                 if (e.target === modal) {
                     modal.classList.remove("visible");
-                    window.history.back();
                 }
             });
             modal.querySelectorAll(".modal-close").forEach((closeBtn) => {
                 closeBtn.addEventListener("click", () => {
                     modal.classList.remove("visible");
-                    window.history.back();
                 });
             });
             this.enhanceModal(modal);
@@ -53,14 +50,6 @@ export class ModalManager {
         document.addEventListener("keydown", (e) => {
             if (e.key !== "Escape") return;
             const open = [...document.querySelectorAll(".modal-overlay.visible")].pop();
-            if (open) {
-                open.classList.remove("visible");
-                window.history.back();
-            }
-        });
-
-        window.addEventListener("popstate", () => {
-            const open = document.querySelector(".modal-overlay.visible");
             if (open) open.classList.remove("visible");
         });
     }

devplacepy/static/js/components/AppContextMenu.js

@@ -51,11 +51,6 @@ export class AppContextMenu extends Component {
         document.addEventListener("keydown", (e) => {
             if (e.key === "Escape") this.close();
         });
-        window.addEventListener("popstate", () => {
-            if (this.menu.classList.contains("visible")) {
-                this.menu.classList.remove("visible");
-            }
-        });
     }
 
     render(items) {
@@ -98,7 +93,6 @@ export class AppContextMenu extends Component {
         if (!items || !items.length) return;
         this.render(items);
         this.menu.classList.add("visible");
-        window.history.pushState({__overlay: true}, "");
         const rect = this.menu.getBoundingClientRect();
         const vv = window.visualViewport;
         const safeW = vv ? vv.width : window.innerWidth;
@@ -117,7 +111,6 @@ export class AppContextMenu extends Component {
 
     close() {
         this.menu.classList.remove("visible");
-        window.history.back();
     }
 
     suppressNextClick() {

devplacepy/static/js/components/AppDialog.js

@@ -64,11 +64,6 @@ export class AppDialog extends Component {
                 this.dismiss();
             }
         });
-        window.addEventListener("popstate", () => {
-            if (this.overlay.classList.contains("visible")) {
-                this.overlay.classList.remove("visible");
-            }
-        });
         overlay.addEventListener("keydown", (e) => {
             if (e.key !== "Tab") return;
             const items = [
@@ -112,7 +107,6 @@ export class AppDialog extends Component {
 
         this.lastFocus = document.activeElement;
         this.overlay.classList.add("visible");
-        window.history.pushState({__overlay: true}, "");
         const focusTarget = mode === "prompt" ? this.input : this.confirmBtn;
         setTimeout(() => {
             focusTarget.focus();
@@ -133,7 +127,6 @@ export class AppDialog extends Component {
 
     close(value) {
         this.overlay.classList.remove("visible");
-        window.history.back();
         if (this.lastFocus && this.lastFocus.focus) this.lastFocus.focus();
         const resolve = this.resolver;
         this.resolver = null;

devplacepy/static/js/components/AppLightbox.js

@@ -54,7 +54,6 @@ export class AppLightbox extends Component {
                 this.close();
             }
         });
-        window.addEventListener("popstate", () => this._onPopstate());
         this.overlay.addEventListener("keydown", (e) => {
             if (e.key === "Tab" && this.overlay.classList.contains("visible")) {
                 e.preventDefault();
@@ -78,23 +77,15 @@ export class AppLightbox extends Component {
         this.bodyOverflow = document.body.style.overflow;
         document.body.style.overflow = "hidden";
         this.overlay.classList.add("visible");
-        window.history.pushState({__overlay: true}, "");
         setTimeout(() => this.closeBtn.focus(), 20);
     }
 
     close() {
         this.overlay.classList.remove("visible");
-        window.history.back();
         this.image.src = "";
         document.body.style.overflow = this.bodyOverflow;
         if (this.lastFocus && this.lastFocus.focus) this.lastFocus.focus();
     }
-
-    _onPopstate() {
-        if (this.overlay.classList.contains("visible")) {
-            this.overlay.classList.remove("visible");
-        }
-    }
 }
 
 customElements.define("dp-lightbox", AppLightbox);

devplacepy/templates/_comment.html

@@ -1,4 +1,4 @@
-{% macro comment_cell(item, depth, parent_author=None) %}
+{% macro comment_cell(item, depth, parent_author=None, parent_url=None) %}
 <div class="comment" style="--comment-depth: {{ depth }};" data-depth="{{ depth }}">
     <div class="comment-votes" role="group" aria-label="Comment votes">
         <form method="POST" action="/votes/comment/{{ item.comment['uid'] }}">
@@ -26,6 +26,7 @@
         {% endif %}
         <div class="comment-actions">
             <button type="button" class="comment-action-btn" data-action="reply"{{ guest_disabled(user) }}><span class="icon">💬</span><span class="label"> Reply</span></button>
+            <button type="button" class="comment-action-btn" data-share="{{ parent_url }}#comment-{{ item.comment['uid'] }}"><span class="icon">&#x1F517;</span><span class="label"> Share</span></button>
             {% if owns(item.comment, user) %}
             <button type="button" class="comment-action-btn" data-action="edit" data-edit-url="/comments/edit/{{ item.comment['uid'] }}"><span class="icon">✏️</span><span class="label"> Edit</span></button>
             <form method="POST" action="/comments/delete/{{ item.comment['uid'] }}" class="inline-form comment-delete-form" data-comment-uid="{{ item.comment['uid'] }}">
@@ -39,21 +40,21 @@
 </div>
 {% endmacro %}
 
-{% macro render_comment(item, depth=0) %}
+{% macro render_comment(item, depth=0, parent_url=None) %}
 {% set max_depth = 2 %}
 {% set visual_depth = depth if depth < max_depth else max_depth %}
-{% call comment_cell(item, visual_depth) %}
+{% call comment_cell(item, visual_depth, parent_url=parent_url) %}
     {% if item.children %}
     {% if depth < max_depth %}
     <div class="comment-replies">
         {% for child in item.children %}
-        {{ render_comment(child, depth + 1) }}
+        {{ render_comment(child, depth + 1, parent_url) }}
         {% endfor %}
     </div>
     {% else %}
     <div class="comment-replies comment-replies-flat">
         {% for child in item.children %}
-        {{ render_comment_flat(child, max_depth, item.author) }}
+        {{ render_comment_flat(child, max_depth, item.author, parent_url) }}
         {% endfor %}
     </div>
     {% endif %}
@@ -61,9 +62,9 @@
 {% endcall %}
 {% endmacro %}
 
-{% macro render_comment_flat(item, depth, parent_author) %}
-{% call comment_cell(item, depth, parent_author) %}{% endcall %}
+{% macro render_comment_flat(item, depth, parent_author, parent_url=None) %}
+{% call comment_cell(item, depth, parent_author, parent_url=parent_url) %}{% endcall %}
 {% for child in item.children %}
-{{ render_comment_flat(child, depth, item.author) }}
+{{ render_comment_flat(child, depth, item.author, parent_url) }}
 {% endfor %}
 {% endmacro %}

devplacepy/templates/_comment_section.html

@@ -3,8 +3,10 @@
 
     {% from "_comment.html" import render_comment with context %}
 
+    {% set parent_url = resolve_object_url(target_type, target_uid) %}
+
     {% for item in comments %}
-    {{ render_comment(item, 0) }}
+    {{ render_comment(item, 0, parent_url) }}
     {% else %}
     <p class="no-comments-msg">No comments yet. Start the discussion.</p>
     {% endfor %}

devplacepy/templating.py

@@ -9,6 +9,7 @@ from devplacepy.cache import TTLCache
 from devplacepy.config import STATIC_VERSION, TEMPLATES_DIR, TEMPLATE_AUTO_RELOAD, PRESENCE_TIMEOUT_SECONDS
 from devplacepy.constants import TOPICS, REACTION_EMOJI
 from devplacepy.database import get_int_setting, get_setting, get_table
+from devplacepy.database.content import resolve_object_url
 from devplacepy.avatar import avatar_url, avatar_seed
 from devplacepy.utils import format_date as _format_date
 from devplacepy.utils import time_ago as _time_ago
@@ -49,6 +50,7 @@ templates.env.globals["is_self"] = is_self
 templates.env.globals["guest_disabled"] = guest_disabled
 templates.env.globals["is_online"] = presence.is_online
 templates.env.globals["presence_timeout"] = PRESENCE_TIMEOUT_SECONDS
+templates.env.globals["resolve_object_url"] = resolve_object_url
 
 from devplacepy.docs_devrant import devrant_endpoints