From 770a5c8412d1d8d1d33a1f8e36c81a64d594d1c9 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 19 May 2020 09:25:09 -0700
Subject: [PATCH] Fix "r" and "R" both replying with quote on inline comments

Summary: Ref T13513. The code which added "r" and "R" to the inline menu accidentally discarded the difference between the keystrokes.

Test Plan:
  - Clicked an inline, pressed "r", got new empty inline (previously: inline with quote).
  - Clicked an inline, pressed "R", got a new quoted inline.
  - Repeated steps with the menu items, got the expected behaviors.

Maniphest Tasks: T13513

Differential Revision: https://secure.phabricator.com/D21268
---
 resources/celerity/map.php                       | 16 ++++++++--------
 .../js/application/diff/DiffChangesetList.js     |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 68fcf9e951..53cf215ae8 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -13,7 +13,7 @@ return array(
     'core.pkg.js' => '845355f4',
     'dark-console.pkg.js' => '187792c2',
     'differential.pkg.css' => '42a2334f',
-    'differential.pkg.js' => 'b57da3e7',
+    'differential.pkg.js' => '8f59bce2',
     'diffusion.pkg.css' => '42c75c37',
     'diffusion.pkg.js' => 'a98c0bf7',
     'maniphest.pkg.css' => '35995d6d',
@@ -380,7 +380,7 @@ return array(
     'rsrc/js/application/dashboard/behavior-dashboard-query-panel-select.js' => '1e413dc9',
     'rsrc/js/application/dashboard/behavior-dashboard-tab-panel.js' => '0116d3e8',
     'rsrc/js/application/diff/DiffChangeset.js' => '0c083409',
-    'rsrc/js/application/diff/DiffChangesetList.js' => 'ac403c32',
+    'rsrc/js/application/diff/DiffChangesetList.js' => 'db615898',
     'rsrc/js/application/diff/DiffInline.js' => 'b00168c1',
     'rsrc/js/application/diff/DiffPathView.js' => '8207abf9',
     'rsrc/js/application/diff/DiffTreeView.js' => '5d83623b',
@@ -775,7 +775,7 @@ return array(
     'phabricator-darkmessage' => '26cd4b73',
     'phabricator-dashboard-css' => '5a205b9d',
     'phabricator-diff-changeset' => '0c083409',
-    'phabricator-diff-changeset-list' => 'ac403c32',
+    'phabricator-diff-changeset-list' => 'db615898',
     'phabricator-diff-inline' => 'b00168c1',
     'phabricator-diff-path-view' => '8207abf9',
     'phabricator-diff-tree-view' => '5d83623b',
@@ -1911,11 +1911,6 @@ return array(
       'javelin-dom',
       'phabricator-notification',
     ),
-    'ac403c32' => array(
-      'javelin-install',
-      'phuix-button-view',
-      'phabricator-diff-tree-view',
-    ),
     'ad258e28' => array(
       'javelin-behavior',
       'javelin-dom',
@@ -2124,6 +2119,11 @@ return array(
       'javelin-uri',
       'phabricator-notification',
     ),
+    'db615898' => array(
+      'javelin-install',
+      'phuix-button-view',
+      'phabricator-diff-tree-view',
+    ),
     'e150bd50' => array(
       'javelin-behavior',
       'javelin-stratcom',
diff --git a/webroot/rsrc/js/application/diff/DiffChangesetList.js b/webroot/rsrc/js/application/diff/DiffChangesetList.js
index e5a6095da2..0397354859 100644
--- a/webroot/rsrc/js/application/diff/DiffChangesetList.js
+++ b/webroot/rsrc/js/application/diff/DiffChangesetList.js
@@ -342,7 +342,7 @@ JX.install('DiffChangesetList', {
           var inline = cursor.target;
           if (inline.canReply()) {
             this.setFocus(null);
-            inline.reply(true);
+            inline.reply(is_quote);
             return;
           }
         }