From 4b94ae15e0bcac699c121093aa8206d84aed11fe Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 4 Jan 2017 19:13:46 -0800
Subject: [PATCH] Straighten out some stacked action removal behaviors

Summary: Fixes T12065. Some of the normal behavior of these actions got juggled when I made "Accept" and "Reject" conflict.

Test Plan:
  - Added "Accept".
  - Added "Reject", saw it remove "Accept".
  - Added "Change Projects".
  - Added "Assign/Claim".
  - Removed "Assign/Claim".
  - Removed "Accept".

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T12065

Differential Revision: https://secure.phabricator.com/D17143
---
 .../js/application/transactions/behavior-comment-actions.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/webroot/rsrc/js/application/transactions/behavior-comment-actions.js b/webroot/rsrc/js/application/transactions/behavior-comment-actions.js
index d10de590d4..44d5597cb5 100644
--- a/webroot/rsrc/js/application/transactions/behavior-comment-actions.js
+++ b/webroot/rsrc/js/application/transactions/behavior-comment-actions.js
@@ -146,7 +146,7 @@ JX.behavior('comment-actions', function(config) {
     var conflict_key = action.conflictKey || null;
     if (conflict_key !== null) {
       for (var k in action_map) {
-        if (k === action) {
+        if (k === action.key) {
           continue;
         }
         if (action_map[k].conflictKey !== conflict_key) {
@@ -189,7 +189,7 @@ JX.behavior('comment-actions', function(config) {
         return;
       }
 
-      remove_action(action);
+      remove_action(action.key);
     });
 
     rows[action.key] = {
@@ -200,7 +200,7 @@ JX.behavior('comment-actions', function(config) {
 
     JX.DOM.listen(remove, 'click', null, function(e) {
       e.kill();
-      remove_action(action);
+      remove_action(action.key);
     });
 
     place_node.parentNode.insertBefore(node, place_node);
-- 
2.51.2