From 827239000a20c5190074f04451c41308d28faf4e Mon Sep 17 00:00:00 2001
From: Go MAEDA <maeda@farend.jp>
Date: Sat, 6 Aug 2022 04:39:34 +0000
Subject: Merged r21738 from trunk to 5.0-stable (#37481).

git-svn-id: https://svn.redmine.org/redmine/branches/5.0-stable@21760 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 public/javascripts/context_menu.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'public/javascripts')

diff --git a/public/javascripts/context_menu.js b/public/javascripts/context_menu.js
index 0dd6ad6b9..8a2bb7495 100644
--- a/public/javascripts/context_menu.js
+++ b/public/javascripts/context_menu.js
@@ -52,11 +52,12 @@ function contextMenuClick(event) {
           if (lastSelected.length) {
             var toggling = false;
             $('.hascontextmenu').each(function(){
-              if (toggling || $(this).is(tr)) {
+              $elm = $(this)
+              if (!$elm.is(lastSelected) && (toggling || $elm.is(tr))) {
                 contextMenuAddSelection($(this));
                 contextMenuClearDocumentSelection();
               }
-              if ($(this).is(tr) || $(this).is(lastSelected)) {
+              if ($elm.is(lastSelected) !== $elm.is(tr)) {
                 toggling = !toggling;
               }
             });
-- 
cgit v1.2.3