diff --git a/Web/Presenters/templates/Wall/Feed.xml b/Web/Presenters/templates/Wall/Feed.xml index 81b4bf21..ec82bbe3 100644 --- a/Web/Presenters/templates/Wall/Feed.xml +++ b/Web/Presenters/templates/Wall/Feed.xml @@ -47,3 +47,7 @@ {/block} + +{if isset($thisUser) && $thisUser->hasMicroblogEnabled()} + {script "js/al_comments.js"} +{/if} diff --git a/Web/Presenters/templates/Wall/HashtagFeed.xml b/Web/Presenters/templates/Wall/HashtagFeed.xml index 12320c43..a58ca4e4 100644 --- a/Web/Presenters/templates/Wall/HashtagFeed.xml +++ b/Web/Presenters/templates/Wall/HashtagFeed.xml @@ -17,3 +17,7 @@ {include "../components/paginator.xml", conf => $paginatorConf} {/block} + +{if isset($thisUser) && $thisUser->hasMicroblogEnabled()} + {script "js/al_comments.js"} +{/if} diff --git a/Web/Presenters/templates/Wall/Wall.xml b/Web/Presenters/templates/Wall/Wall.xml index 7e1969e8..9b6fe6b4 100644 --- a/Web/Presenters/templates/Wall/Wall.xml +++ b/Web/Presenters/templates/Wall/Wall.xml @@ -34,3 +34,7 @@ {/block} + +{if isset($thisUser) && $thisUser->hasMicroblogEnabled()} + {script "js/al_comments.js"} +{/if} diff --git a/Web/Presenters/templates/components/comment.xml b/Web/Presenters/templates/components/comment.xml index 701db922..94122ac7 100644 --- a/Web/Presenters/templates/components/comment.xml +++ b/Web/Presenters/templates/components/comment.xml @@ -1,8 +1,9 @@ {var author = $comment->getOwner()} {var $Club = openvk\Web\Models\Entities\Club::class} +{var postId = $comment->getTarget() instanceof \openvk\Web\Models\Entities\Post ? $comment->getTarget()->getId() : NULL} - +
diff --git a/Web/Presenters/templates/components/wall.xml b/Web/Presenters/templates/components/wall.xml index f353f573..f8be0067 100644 --- a/Web/Presenters/templates/components/wall.xml +++ b/Web/Presenters/templates/components/wall.xml @@ -25,3 +25,7 @@ + +{if isset($thisUser) && $thisUser->hasMicroblogEnabled()} + {script "js/al_comments.js"} +{/if} diff --git a/Web/static/js/al_comments.js b/Web/static/js/al_comments.js index 111b558c..21acd797 100644 --- a/Web/static/js/al_comments.js +++ b/Web/static/js/al_comments.js @@ -1,11 +1,10 @@ u(".comment-reply").on("click", function(e) { - let inputbox = u("#write textarea"); let comment = u(e.target).closest(".post"); let authorId = comment.data("owner-id"); let authorNm = u(".post-author > a > b", comment.first()).text().trim(); let fromGroup = Boolean(comment.data("from-group")); let postId = comment.data("post-id"); - console.log(postId) + let inputbox = postId == null ? u("#write textarea") : u("#wall-post-input" + (postId || "")); inputbox.text("[" + (fromGroup ? "club" : "id") + authorId + "|" + authorNm + "], "); inputbox.trigger("focusin");