diff --git a/resources/celerity/map.php b/resources/celerity/map.php --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -7,7 +7,7 @@ */ return array( 'names' => array( - 'core.pkg.css' => 'a4b1b2ae', + 'core.pkg.css' => 'a7f3dc55', 'core.pkg.js' => '31bc6546', 'darkconsole.pkg.js' => '8ab24e01', 'differential.pkg.css' => '1940be3f', @@ -21,7 +21,7 @@ 'rsrc/css/aphront/dialog-view.css' => 'd2e76b88', 'rsrc/css/aphront/lightbox-attachment.css' => '7acac05d', 'rsrc/css/aphront/list-filter-view.css' => '2ae43867', - 'rsrc/css/aphront/multi-column.css' => '41a848c0', + 'rsrc/css/aphront/multi-column.css' => 'fd18389d', 'rsrc/css/aphront/notification.css' => '9c279160', 'rsrc/css/aphront/pager-view.css' => '2e3539af', 'rsrc/css/aphront/panel-view.css' => '8427b78d', @@ -353,7 +353,7 @@ 'rsrc/js/application/auth/behavior-persona-login.js' => '9414ff18', 'rsrc/js/application/config/behavior-reorder-fields.js' => '14a827de', 'rsrc/js/application/conpherence/ConpherenceThreadManager.js' => '0324970d', - 'rsrc/js/application/conpherence/behavior-durable-column.js' => 'a3ba7034', + 'rsrc/js/application/conpherence/behavior-durable-column.js' => '217c5ea5', 'rsrc/js/application/conpherence/behavior-menu.js' => 'c4151295', 'rsrc/js/application/conpherence/behavior-pontificate.js' => '21ba5861', 'rsrc/js/application/conpherence/behavior-quicksand-blacklist.js' => '7927a7d3', @@ -501,7 +501,7 @@ 'aphront-dark-console-css' => '6378ef3d', 'aphront-dialog-view-css' => 'd2e76b88', 'aphront-list-filter-view-css' => '2ae43867', - 'aphront-multi-column-view-css' => '41a848c0', + 'aphront-multi-column-view-css' => 'fd18389d', 'aphront-pager-view-css' => '2e3539af', 'aphront-panel-view-css' => '8427b78d', 'aphront-table-view-css' => 'b22b7216', @@ -583,7 +583,7 @@ 'javelin-behavior-diffusion-locate-file' => '6d3e1947', 'javelin-behavior-diffusion-pull-lastmodified' => '2b228192', 'javelin-behavior-doorkeeper-tag' => 'e5822781', - 'javelin-behavior-durable-column' => 'a3ba7034', + 'javelin-behavior-durable-column' => '217c5ea5', 'javelin-behavior-error-log' => '6882e80a', 'javelin-behavior-fancy-datepicker' => 'c51ae228', 'javelin-behavior-global-drag-and-drop' => 'bbdf75ca', @@ -973,6 +973,16 @@ 'phabricator-phtize', 'changeset-view-manager', ), + '217c5ea5' => array( + 'javelin-behavior', + 'javelin-dom', + 'javelin-stratcom', + 'javelin-behavior-device', + 'javelin-scrollbar', + 'javelin-quicksand', + 'phabricator-keyboard-shortcut', + 'conpherence-thread-manager', + ), '21ba5861' => array( 'javelin-behavior', 'javelin-dom', @@ -1608,16 +1618,6 @@ 'javelin-vector', 'javelin-magical-init', ), - 'a3ba7034' => array( - 'javelin-behavior', - 'javelin-dom', - 'javelin-stratcom', - 'javelin-behavior-device', - 'javelin-scrollbar', - 'javelin-quicksand', - 'phabricator-keyboard-shortcut', - 'conpherence-thread-manager', - ), 'a48aa699' => array( 'javelin-behavior', 'javelin-stratcom', diff --git a/webroot/rsrc/js/application/conpherence/behavior-durable-column.js b/webroot/rsrc/js/application/conpherence/behavior-durable-column.js --- a/webroot/rsrc/js/application/conpherence/behavior-durable-column.js +++ b/webroot/rsrc/js/application/conpherence/behavior-durable-column.js @@ -281,6 +281,21 @@ 'conpherence-message-form', _sendMessage); + // Send on enter if the shift key is not held. + JX.Stratcom.listen( + 'keydown', + 'conpherence-message-form', + function(e) { + if (e.getSpecialKey() != 'return') { + return; + } + var raw = e.getRawEvent(); + if (raw.shiftKey) { + return; + } + _sendMessage(e); + }); + JX.Stratcom.listen( ['keydown'], 'conpherence-durable-column-textarea',