From d299b866286da681221655c8d69da0a5f44dd614 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Mon, 29 Jun 2020 17:47:39 -0400
Subject: [PATCH] fix: remove role attr for dropdown elements

---
 templates/partials/topic/post-menu-list.tpl | 41 ++++++++++-----------
 1 file changed, 19 insertions(+), 22 deletions(-)

diff --git a/templates/partials/topic/post-menu-list.tpl b/templates/partials/topic/post-menu-list.tpl
index 3d48740..161f1c6 100644
--- a/templates/partials/topic/post-menu-list.tpl
+++ b/templates/partials/topic/post-menu-list.tpl
@@ -1,22 +1,22 @@
 <!-- IF posts.display_moderator_tools -->
-<li role="presentation" class="dropdown-header">[[topic:tools]]</li>
-<li role="presentation">
+<li class="dropdown-header">[[topic:tools]]</li>
+<li>
 	<a component="post/edit" role="menuitem" tabindex="-1" href="#">
 		<span class="menu-icon"><i class="fa fa-fw fa-pencil"></i></span> [[topic:edit]]
 	</a>
 </li>
-<li role="presentation" <!-- IF posts.deleted -->hidden<!-- ENDIF posts.deleted -->>
+<li <!-- IF posts.deleted -->hidden<!-- ENDIF posts.deleted -->>
 	<a component="post/delete" role="menuitem" tabindex="-1" href="#" class="<!-- IF posts.deleted -->hidden<!-- ENDIF posts.deleted -->">
 		<div class="inline menu-icon"><i class="fa fa-fw fa-trash-o"></i></div> <span>[[topic:delete]]</span>
 	</a>
 </li>
-<li role="presentation" <!-- IF !posts.deleted -->hidden<!-- ENDIF !posts.deleted -->>
+<li <!-- IF !posts.deleted -->hidden<!-- ENDIF !posts.deleted -->>
 	<a component="post/restore" role="menuitem" tabindex="-1" href="#" class="<!-- IF !posts.deleted -->hidden<!-- ENDIF !posts.deleted -->">
 		<div class="inline menu-icon"><i class="fa fa-fw fa-history"></i></div> <span>[[topic:restore]]</span>
 	</a>
 </li>
 <!-- IF posts.display_purge_tools -->
-<li role="presentation" <!-- IF !posts.deleted -->hidden<!-- ENDIF !posts.deleted -->>
+<li <!-- IF !posts.deleted -->hidden<!-- ENDIF !posts.deleted -->>
 	<a component="post/purge" role="menuitem" tabindex="-1" href="#" class="<!-- IF !posts.deleted -->hidden<!-- ENDIF !posts.deleted -->">
 		<span class="menu-icon"><i class="fa fa-fw fa-eraser"></i></span> [[topic:purge]]
 	</a>
@@ -24,7 +24,7 @@
 <!-- END -->
 
 <!-- IF posts.display_history -->
-<li role="presentation">
+<li>
 	<a component="post/view-history" role="menuitem" tabindex="-1" href="#">
 		<span class="menu-icon"><i class="fa fa-fw fa-history"></i></span> [[topic:view-history]]
 	</a>
@@ -32,7 +32,7 @@
 <!-- END -->
 
 <!-- IF posts.display_move_tools -->
-<li role="presentation">
+<li>
 	<a component="post/move" role="menuitem" tabindex="-1" href="#">
 		<span class="menu-icon"><i class="fa fa-fw fa-arrows"></i></span> [[topic:move]]
 	</a>
@@ -40,7 +40,7 @@
 <!-- ENDIF posts.display_move_tools -->
 
 <!-- IF posts.display_change_owner_tools -->
-<li role="presentation">
+<li>
 	<a component="post/change-owner" role="menuitem" tabindex="-1" href="#">
 		<span class="menu-icon"><i class="fa fa-fw fa-user"></i></span> [[topic:change-owner]]
 	</a>
@@ -48,13 +48,13 @@
 <!-- ENDIF posts.display_change_owner_tools -->
 
 <!-- IF posts.ip -->
-<li role="presentation">
+<li>
 	<a component="post/copy-ip" role="menuitem" tabindex="-1" href="#" data-clipboard-text="{posts.ip}">
 		<span class="menu-icon" ><i class="fa fa-fw fa-copy"></i></span> [[topic:copy-ip]] {posts.ip}
 	</a>
 </li>
 <!-- IF posts.display_ip_ban -->
-<li role="presentation">
+<li>
 	<a component="post/ban-ip" role="menuitem" tabindex="-1" href="#" data-ip="{posts.ip}">
 		<span class="menu-icon"><i class="fa fa-fw fa-ban"></i></span> [[topic:ban-ip]] {posts.ip}
 	</a>
@@ -64,19 +64,19 @@
 <!-- ENDIF posts.display_moderator_tools -->
 
 {{{each posts.tools}}}
-<li role="presentation">
+<li>
 	<a component="{posts.tools.action}" role="menuitem" tabindex="-1" href="#">
 		<span class="menu-icon"><i class="fa fa-fw {posts.tools.icon}"></i></span> {{posts.tools.html}}
 	</a>
 </li>
 {{{end}}}
 <!-- IF posts.toolsVisible -->
-<li role="presentation" class="divider"></li>
+<li class="divider"></li>
 <!-- ENDIF posts.toolsVisible -->
 
 <!-- IF !posts.deleted -->
 <!-- IF config.loggedIn -->
-<li role="presentation">
+<li>
 	<a component="post/bookmark" role="menuitem" tabindex="-1" href="#" data-bookmarked="{posts.bookmarked}">
 
 		<span class="bookmark-text">[[topic:bookmark]]</span>
@@ -89,21 +89,18 @@
 <!-- ENDIF config.loggedIn -->
 
 <!-- IF postSharing.length -->
-<li role="presentation" class="divider"></li>
-<li role="presentation" class="dropdown-header">[[topic:share_this_post]]</li>
+<li class="divider"></li>
+<li class="dropdown-header">[[topic:share_this_post]]</li>
 <!-- ENDIF postSharing.length -->
 {{{each postSharing}}}
-	<li role="presentation">
+	<li>
 		<a role="menuitem" component="share/{postSharing.id}" tabindex="-1" href="#"><span class="menu-icon"><i class="fa fa-fw {postSharing.class}"></i></span> {postSharing.name}</a>
 	</li>
 {{{end}}}
 
 <!-- IF posts.display_flag_tools -->
-<li role="presentation" class="divider"></li>
-<li role="presentation">
-	<a component="post/flag" role="menuitem" tabindex="-1" href="#">
-		[[topic:flag_title]]
-	</a>
-</li>
+<li class="divider"></li>
+<li><a component="post/flag" role="menuitem" tabindex="-1" href="#"><i class="fa fa-fw fa-flag"></i> [[topic:flag_post]]</a></li>
+<li><a component="post/flagUser" role="menuitem" tabindex="-1" href="#"><i class="fa fa-fw fa-flag"></i> [[topic:flag_user]]</a></li>
 <!-- ENDIF posts.display_flag_tools -->
 <!-- ENDIF !posts.deleted -->
\ No newline at end of file