From 1c222c88349eefbeafa46271e8b400a42aa955f2 Mon Sep 17 00:00:00 2001 From: epriestley Date: Wed, 19 Apr 2017 17:02:52 -0700 Subject: [PATCH] In Conpherence, stop throwing away stuff users have typed when a reply arrives Summary: Ref T12562. I think the pre-send-on-enter behavior was: disable textarea, send message, clear area on response? That got changed but not completely, maybe. There's currently an issue here: - Add a `sleep(3)` to `UpdateController`. - Type "AAA". - Press enter. - Real fast, type "BBB". - When the "AAA" arrives, your "BBB" is lost. Sad! Test Plan: - Did the thing described above; no longer lost "BBB". - Switched threads, sent messages, couldn't find anything else this breaks. It dates from a long time ago so I think it's just pre-SOE stuff. Reviewers: chad Reviewed By: chad Maniphest Tasks: T12562 Differential Revision: https://secure.phabricator.com/D17742 --- resources/celerity/map.php | 34 +++++++++---------- .../application/conpherence/behavior-menu.js | 1 - 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/resources/celerity/map.php b/resources/celerity/map.php index c31dc9855b..e431b931d4 100644 --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -8,7 +8,7 @@ return array( 'names' => array( 'conpherence.pkg.css' => '3776e82d', - 'conpherence.pkg.js' => '5f86c17d', + 'conpherence.pkg.js' => '7b6aa581', 'core.pkg.css' => '959330a2', 'core.pkg.js' => '47a69358', 'darkconsole.pkg.js' => '1f9a31bc', @@ -378,7 +378,7 @@ return array( 'rsrc/js/application/conpherence/ConpherenceThreadManager.js' => '4d863052', 'rsrc/js/application/conpherence/behavior-conpherence-search.js' => '9bbf3762', 'rsrc/js/application/conpherence/behavior-durable-column.js' => 'aa3bd034', - 'rsrc/js/application/conpherence/behavior-menu.js' => '80dda04a', + 'rsrc/js/application/conpherence/behavior-menu.js' => '31ab6d0f', 'rsrc/js/application/conpherence/behavior-participant-pane.js' => '8604caa8', 'rsrc/js/application/conpherence/behavior-pontificate.js' => '55616e04', 'rsrc/js/application/conpherence/behavior-quicksand-blacklist.js' => '7927a7d3', @@ -605,7 +605,7 @@ return array( 'javelin-behavior-choose-control' => '327a00d1', 'javelin-behavior-comment-actions' => '9a6dd75c', 'javelin-behavior-config-reorder-fields' => 'b6993408', - 'javelin-behavior-conpherence-menu' => '80dda04a', + 'javelin-behavior-conpherence-menu' => '31ab6d0f', 'javelin-behavior-conpherence-participant-pane' => '8604caa8', 'javelin-behavior-conpherence-pontificate' => '55616e04', 'javelin-behavior-conpherence-search' => '9bbf3762', @@ -1126,6 +1126,20 @@ return array( '31420f77' => array( 'javelin-behavior', ), + '31ab6d0f' => array( + 'javelin-behavior', + 'javelin-dom', + 'javelin-util', + 'javelin-stratcom', + 'javelin-workflow', + 'javelin-behavior-device', + 'javelin-history', + 'javelin-vector', + 'javelin-scrollbar', + 'phabricator-title', + 'phabricator-shaped-request', + 'conpherence-thread-manager', + ), '320810c8' => array( 'javelin-install', 'javelin-dom', @@ -1532,20 +1546,6 @@ return array( 'javelin-vector', 'javelin-stratcom', ), - '80dda04a' => array( - 'javelin-behavior', - 'javelin-dom', - 'javelin-util', - 'javelin-stratcom', - 'javelin-workflow', - 'javelin-behavior-device', - 'javelin-history', - 'javelin-vector', - 'javelin-scrollbar', - 'phabricator-title', - 'phabricator-shaped-request', - 'conpherence-thread-manager', - ), '834a1173' => array( 'javelin-behavior', 'javelin-scrollbar', diff --git a/webroot/rsrc/js/application/conpherence/behavior-menu.js b/webroot/rsrc/js/application/conpherence/behavior-menu.js index a8151428e4..4c7fbd3479 100644 --- a/webroot/rsrc/js/application/conpherence/behavior-menu.js +++ b/webroot/rsrc/js/application/conpherence/behavior-menu.js @@ -70,7 +70,6 @@ JX.behavior('conpherence-menu', function(config) { var textarea = JX.DOM.find(form_root, 'textarea'); if (!non_update) { _scrollMessageWindow(); - textarea.value = ''; } markThreadLoading(false);