forked from retoor/devplacepy
Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b65360be40 |
File diff suppressed because one or more lines are too long
@@ -115,6 +115,7 @@ devii-terminal.devii-state-fullscreen .devii-window {
|
||||
}
|
||||
|
||||
devii-terminal.devii-state-normal .devii-window {
|
||||
resize: both;
|
||||
}
|
||||
devii-terminal.devii-state-normal .devii-titlebar {
|
||||
cursor: move;
|
||||
|
||||
@@ -86,7 +86,6 @@ export class DeviiTerminal {
|
||||
}
|
||||
|
||||
_canOpenOnGesture() {
|
||||
if (this.element && this.element.state !== "closed") return false;
|
||||
if (document.querySelector(".modal-overlay.visible")) return false;
|
||||
if (document.querySelector(".dialog-overlay.visible")) return false;
|
||||
if (document.querySelector(".context-menu.visible")) return false;
|
||||
|
||||
@@ -297,8 +297,8 @@ export default class FloatingWindow extends Component {
|
||||
if (!this.geometry) return;
|
||||
const g = this.geometry;
|
||||
const safeHeight = this._safeViewport.height;
|
||||
g.width = Math.max(320, Math.min(g.width, window.innerWidth - 16));
|
||||
g.height = Math.max(220, Math.min(g.height, safeHeight - 16));
|
||||
g.width = Math.min(g.width, window.innerWidth - 16);
|
||||
g.height = Math.min(g.height, safeHeight - 16);
|
||||
g.left = Math.max(8, Math.min(g.left, window.innerWidth - g.width - 8));
|
||||
g.top = Math.max(8, Math.min(g.top, safeHeight - g.height - 8));
|
||||
}
|
||||
@@ -409,8 +409,8 @@ export default class FloatingWindow extends Component {
|
||||
this._ro = new ResizeObserver(() => {
|
||||
if (this.state === "normal" && this.geometry && !this._drag) {
|
||||
const rect = this.win.getBoundingClientRect();
|
||||
this.geometry.width = Math.max(320, Math.round(rect.width));
|
||||
this.geometry.height = Math.max(220, Math.round(rect.height));
|
||||
this.geometry.width = Math.round(rect.width);
|
||||
this.geometry.height = Math.round(rect.height);
|
||||
this._persistGeometry();
|
||||
}
|
||||
this._syncControls();
|
||||
|
||||
@@ -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">🔗</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 %}
|
||||
|
||||
@@ -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 %}
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user