diff --git a/resources/celerity/map.php b/resources/celerity/map.php index ed4163c4d6..d40b9bc210 100644 --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -10,7 +10,7 @@ return array( 'conpherence.pkg.css' => '5f3eb99c', 'conpherence.pkg.js' => '11f3e07e', 'core.pkg.css' => '3fa66cb3', - 'core.pkg.js' => '26f1f9bf', + 'core.pkg.js' => '30185d95', 'darkconsole.pkg.js' => 'e7393ebb', 'differential.pkg.css' => 'e1d704ce', 'differential.pkg.js' => '634399e9', @@ -438,7 +438,7 @@ return array( 'rsrc/js/application/config/behavior-reorder-fields.js' => 'b6993408', 'rsrc/js/application/conpherence/ConpherenceThreadManager.js' => '01774ab2', 'rsrc/js/application/conpherence/behavior-drag-and-drop-photo.js' => 'cf86d16a', - 'rsrc/js/application/conpherence/behavior-durable-column.js' => 'f62bfb39', + 'rsrc/js/application/conpherence/behavior-durable-column.js' => 'c5238acb', 'rsrc/js/application/conpherence/behavior-menu.js' => '9eb55204', 'rsrc/js/application/conpherence/behavior-participant-pane.js' => '8604caa8', 'rsrc/js/application/conpherence/behavior-pontificate.js' => 'f2e58483', @@ -699,7 +699,7 @@ return array( 'javelin-behavior-diffusion-pull-lastmodified' => 'f01586dc', 'javelin-behavior-doorkeeper-tag' => 'e5822781', 'javelin-behavior-drydock-live-operation-status' => '901935ef', - 'javelin-behavior-durable-column' => 'f62bfb39', + 'javelin-behavior-durable-column' => 'c5238acb', 'javelin-behavior-editengine-reorder-configs' => 'd7a74243', 'javelin-behavior-editengine-reorder-fields' => 'b59e1e96', 'javelin-behavior-error-log' => '6882e80a', @@ -1963,6 +1963,16 @@ return array( 'javelin-install', 'javelin-dom', ), + 'c5238acb' => array( + 'javelin-behavior', + 'javelin-dom', + 'javelin-stratcom', + 'javelin-behavior-device', + 'javelin-scrollbar', + 'javelin-quicksand', + 'phabricator-keyboard-shortcut', + 'conpherence-thread-manager', + ), 'c587b80f' => array( 'javelin-install', ), @@ -2206,16 +2216,6 @@ return array( 'javelin-request', 'phabricator-keyboard-shortcut', ), - 'f62bfb39' => array( - 'javelin-behavior', - 'javelin-dom', - 'javelin-stratcom', - 'javelin-behavior-device', - 'javelin-scrollbar', - 'javelin-quicksand', - 'phabricator-keyboard-shortcut', - 'conpherence-thread-manager', - ), 'f6555212' => array( 'javelin-install', 'javelin-reactornode', diff --git a/webroot/rsrc/js/application/conpherence/behavior-durable-column.js b/webroot/rsrc/js/application/conpherence/behavior-durable-column.js index ad368edb9b..a7fe3fbef7 100644 --- a/webroot/rsrc/js/application/conpherence/behavior-durable-column.js +++ b/webroot/rsrc/js/application/conpherence/behavior-durable-column.js @@ -66,6 +66,11 @@ JX.behavior('durable-column', function(config, statics) { JX.DOM.alterClass(document.body, 'minimize-column', userMinimize); JX.Stratcom.invoke('resize'); + if (!userMinimize) { + var messages = _getColumnMessagesNode(); + scrollbar.scrollTo(messages.scrollHeight); + } + new JX.Request(config.minimizeURI) .setData({value: (userMinimize ? 1 : 0)}) .send();