Infra-Mirrors/BookStack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-10-01 01:36:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Updated comment delete action to be a button

Browse Source 
Fixes issue that causes code error when an anchor tag.

Closes #1650
This commit is contained in:
Dan Brown 2019-10-07 20:21:04 +01:00
parent 23db81f2cc
commit b6c0baf44d
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/assets/js/components/page-comments.js
View File

@ -26,10 +26,12 @@ class PageComments {
handleAction(event) { handleAction(event) {
let actionElem = event.target.closest('[action]'); let actionElem = event.target.closest('[action]');
if (event.target.matches('a[href^="#"]')) { if (event.target.matches('a[href^="#"]')) {
const id = event.target.href.split('#')[1]; const id = event.target.href.split('#')[1];
scrollAndHighlightElement(document.querySelector('#' + id)); scrollAndHighlightElement(document.querySelector('#' + id));
} }
if (actionElem === null) return; if (actionElem === null) return;
event.preventDefault(); event.preventDefault();

2
resources/views/comments/comment.blade.php
View File

@ -31,7 +31,7 @@
<button type="button" dropdown-toggle aria-haspopup="true" aria-expanded="false" class="text-button" title="{{ trans('common.delete') }}">@icon('delete')</button> <button type="button" dropdown-toggle aria-haspopup="true" aria-expanded="false" class="text-button" title="{{ trans('common.delete') }}">@icon('delete')</button>
<ul class="dropdown-menu" role="menu"> <ul class="dropdown-menu" role="menu">
<li class="px-m text-small text-muted pb-s">{{trans('entities.comment_delete_confirm')}}</li> <li class="px-m text-small text-muted pb-s">{{trans('entities.comment_delete_confirm')}}</li>
<li><a action="delete" href="#" class="text-button text-neg" >@icon('delete'){{ trans('common.delete') }}</a></li> <li><button action="delete" type="button" class="text-button text-neg" >@icon('delete'){{ trans('common.delete') }}</button></li>
</ul> </ul>
</div> </div>
@endif @endif