Page MenuHomePhabricator
Files F14373064

D17143.id41229.diff
No OneTemporary
Actions

D17143.id41229.diff
View Options

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -454,7 +454,7 @@
'rsrc/js/application/search/behavior-reorder-profile-menu-items.js' => 'e2e0a072',
'rsrc/js/application/search/behavior-reorder-queries.js' => 'e9581f08',
'rsrc/js/application/slowvote/behavior-slowvote-embed.js' => '887ad43f',
- 'rsrc/js/application/transactions/behavior-comment-actions.js' => '8fd8b2b1',
+ 'rsrc/js/application/transactions/behavior-comment-actions.js' => 'b52947eb',
'rsrc/js/application/transactions/behavior-reorder-configs.js' => 'd7a74243',
'rsrc/js/application/transactions/behavior-reorder-fields.js' => 'b59e1e96',
'rsrc/js/application/transactions/behavior-show-older-transactions.js' => '94c65b72',
@@ -610,7 +610,7 @@
'javelin-behavior-bulk-job-reload' => 'edf8a145',
'javelin-behavior-calendar-month-view' => 'fe33e256',
'javelin-behavior-choose-control' => '327a00d1',
- 'javelin-behavior-comment-actions' => '8fd8b2b1',
+ 'javelin-behavior-comment-actions' => 'b52947eb',
'javelin-behavior-config-reorder-fields' => 'b6993408',
'javelin-behavior-conpherence-menu' => '7524fcfa',
'javelin-behavior-conpherence-participant-pane' => '8604caa8',
@@ -1650,15 +1650,6 @@
'javelin-stratcom',
'javelin-util',
),
- '8fd8b2b1' => array(
- 'javelin-behavior',
- 'javelin-stratcom',
- 'javelin-workflow',
- 'javelin-dom',
- 'phuix-form-control-view',
- 'phuix-icon-view',
- 'javelin-behavior-phabricator-gesture',
- ),
'8ff5e24c' => array(
'javelin-behavior',
'javelin-stratcom',
@@ -1892,6 +1883,15 @@
'javelin-typeahead-preloaded-source',
'javelin-util',
),
+ 'b52947eb' => array(
+ 'javelin-behavior',
+ 'javelin-stratcom',
+ 'javelin-workflow',
+ 'javelin-dom',
+ 'phuix-form-control-view',
+ 'phuix-icon-view',
+ 'javelin-behavior-phabricator-gesture',
+ ),
'b59e1e96' => array(
'javelin-behavior',
'javelin-stratcom',
diff --git a/webroot/rsrc/js/application/transactions/behavior-comment-actions.js b/webroot/rsrc/js/application/transactions/behavior-comment-actions.js
--- a/webroot/rsrc/js/application/transactions/behavior-comment-actions.js
+++ b/webroot/rsrc/js/application/transactions/behavior-comment-actions.js
@@ -146,7 +146,7 @@
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 @@
return;
}
- remove_action(action);
+ remove_action(action.key);
});
rows[action.key] = {
@@ -200,7 +200,7 @@
JX.DOM.listen(remove, 'click', null, function(e) {
e.kill();
- remove_action(action);
+ remove_action(action.key);
});
place_node.parentNode.insertBefore(node, place_node);

File Metadata

Mime Type
text/plain
Expires
Sat, Dec 21, 8:25 PM (15 h, 59 m)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6915832
Default Alt Text
D17143.id41229.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility