Merged r21738 from trunk to 4.2-stable (#37481).

git-svn-id: https://svn.redmine.org/redmine/branches/4.2-stable@21761 e93f8b46-1217-0410-a6f0-8f06a7374b81

1 files changed, 3 insertions, 2 deletions

diff --git a/public/javascripts/context_menu.js b/public/javascripts/context_menu.js
index 55d77bd77..28771a25a 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;
               }
             });