diff --git a/resources/celerity/map.php b/resources/celerity/map.php --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -7,10 +7,10 @@ */ return array( 'names' => array( - 'conpherence.pkg.css' => 'f934296b', + 'conpherence.pkg.css' => '9d7f1ac1', 'conpherence.pkg.js' => 'cbe4d9be', 'core.pkg.css' => 'b99bbf5e', - 'core.pkg.js' => '30185d95', + 'core.pkg.js' => '3eb7abf7', 'darkconsole.pkg.js' => 'e7393ebb', 'differential.pkg.css' => 'e1d704ce', 'differential.pkg.js' => '634399e9', @@ -46,7 +46,7 @@ 'rsrc/css/application/config/config-template.css' => '8f18fa41', 'rsrc/css/application/config/setup-issue.css' => 'f794cfc3', 'rsrc/css/application/config/unhandled-exception.css' => '4c96257a', - 'rsrc/css/application/conpherence/durable-column.css' => '44bcaa19', + 'rsrc/css/application/conpherence/durable-column.css' => '2b57f55e', 'rsrc/css/application/conpherence/header-pane.css' => 'e8acbd37', 'rsrc/css/application/conpherence/menu.css' => '4f51db5a', 'rsrc/css/application/conpherence/message-pane.css' => '7a94bf5e', @@ -435,9 +435,9 @@ 'rsrc/js/application/calendar/behavior-month-view.js' => 'fe33e256', 'rsrc/js/application/calendar/behavior-recurring-edit.js' => '5f1c4d5f', 'rsrc/js/application/config/behavior-reorder-fields.js' => 'b6993408', - 'rsrc/js/application/conpherence/ConpherenceThreadManager.js' => '01774ab2', + 'rsrc/js/application/conpherence/ConpherenceThreadManager.js' => '358c717b', 'rsrc/js/application/conpherence/behavior-conpherence-search.js' => '3e137827', - 'rsrc/js/application/conpherence/behavior-durable-column.js' => 'c5238acb', + 'rsrc/js/application/conpherence/behavior-durable-column.js' => 'aa3bd034', 'rsrc/js/application/conpherence/behavior-menu.js' => '07928ca3', 'rsrc/js/application/conpherence/behavior-participant-pane.js' => '8604caa8', 'rsrc/js/application/conpherence/behavior-pontificate.js' => 'f2e58483', @@ -616,13 +616,13 @@ 'conduit-api-css' => '7bc725c4', 'config-options-css' => '0ede4c9b', 'config-page-css' => '8798e14f', - 'conpherence-durable-column-view' => '44bcaa19', + 'conpherence-durable-column-view' => '2b57f55e', 'conpherence-header-pane-css' => 'e8acbd37', 'conpherence-menu-css' => '4f51db5a', 'conpherence-message-pane-css' => '7a94bf5e', 'conpherence-notification-css' => '965db05b', 'conpherence-participant-pane-css' => '7bba0b56', - 'conpherence-thread-manager' => '01774ab2', + 'conpherence-thread-manager' => '358c717b', 'conpherence-transaction-css' => '85129c68', 'd3' => 'a11a5ff2', 'differential-changeset-view-css' => '9ef7d354', @@ -695,7 +695,7 @@ 'javelin-behavior-diffusion-pull-lastmodified' => 'f01586dc', 'javelin-behavior-doorkeeper-tag' => 'e5822781', 'javelin-behavior-drydock-live-operation-status' => '901935ef', - 'javelin-behavior-durable-column' => 'c5238acb', + 'javelin-behavior-durable-column' => 'aa3bd034', 'javelin-behavior-editengine-reorder-configs' => 'd7a74243', 'javelin-behavior-editengine-reorder-fields' => 'b59e1e96', 'javelin-behavior-error-log' => '6882e80a', @@ -974,17 +974,6 @@ 'javelin-request', 'javelin-typeahead-source', ), - '01774ab2' => array( - 'javelin-dom', - 'javelin-util', - 'javelin-stratcom', - 'javelin-install', - 'javelin-aphlict', - 'javelin-workflow', - 'javelin-router', - 'javelin-behavior-device', - 'javelin-vector', - ), '019f36c4' => array( 'javelin-behavior', 'javelin-dom', @@ -1211,6 +1200,17 @@ 'javelin-dom', 'javelin-workflow', ), + '358c717b' => array( + 'javelin-dom', + 'javelin-util', + 'javelin-stratcom', + 'javelin-install', + 'javelin-aphlict', + 'javelin-workflow', + 'javelin-router', + 'javelin-behavior-device', + 'javelin-vector', + ), '3ab51e2c' => array( 'javelin-behavior', 'javelin-behavior-device', @@ -1839,6 +1839,16 @@ 'javelin-util', 'phabricator-prefab', ), + 'aa3bd034' => array( + 'javelin-behavior', + 'javelin-dom', + 'javelin-stratcom', + 'javelin-behavior-device', + 'javelin-scrollbar', + 'javelin-quicksand', + 'phabricator-keyboard-shortcut', + 'conpherence-thread-manager', + ), 'ab2f381b' => array( 'javelin-request', 'javelin-behavior', @@ -1966,16 +1976,6 @@ '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', ), diff --git a/src/applications/conpherence/ConpherenceTransactionRenderer.php b/src/applications/conpherence/ConpherenceTransactionRenderer.php --- a/src/applications/conpherence/ConpherenceTransactionRenderer.php +++ b/src/applications/conpherence/ConpherenceTransactionRenderer.php @@ -5,7 +5,6 @@ public static function renderTransactions( PhabricatorUser $user, ConpherenceThread $conpherence, - $full_display = true, $marker_type = 'older') { $transactions = $conpherence->getTransactions(); @@ -74,8 +73,7 @@ ->setUser($user) ->setConpherenceThread($conpherence) ->setHandles($handles) - ->setMarkupEngine($engine) - ->setFullDisplay($full_display); + ->setMarkupEngine($engine); foreach ($transactions as $transaction) { $collapsed = false; diff --git a/src/applications/conpherence/controller/ConpherenceUpdateController.php b/src/applications/conpherence/controller/ConpherenceUpdateController.php --- a/src/applications/conpherence/controller/ConpherenceUpdateController.php +++ b/src/applications/conpherence/controller/ConpherenceUpdateController.php @@ -335,9 +335,6 @@ $request->getInt('latest_transaction_id')) ->appendForm($form); - if ($request->getExists('minimal_display')) { - $view->addHiddenInput('minimal_display', true); - } return $view; } @@ -477,9 +474,6 @@ ->addHiddenInput('__continue__', true) ->appendChild($form); - if ($request->getExists('minimal_display')) { - $view->addHiddenInput('minimal_display', true); - } if ($request->getExists('force_ajax')) { $view->addHiddenInput('force_ajax', true); } @@ -492,7 +486,6 @@ $conpherence_id, $latest_transaction_id) { - $minimal_display = $this->getRequest()->getExists('minimal_display'); $need_transactions = false; $need_participant_cache = true; switch ($action) { @@ -525,8 +518,7 @@ if ($need_transactions && $conpherence->getTransactions()) { $data = ConpherenceTransactionRenderer::renderTransactions( $user, - $conpherence, - !$minimal_display); + $conpherence); $key = PhabricatorConpherenceColumnMinimizeSetting::SETTINGKEY; $minimized = $user->getUserSetting($key); if (!$minimized) { @@ -547,35 +539,33 @@ $nav_item = null; $header = null; $people_widget = null; - if (!$minimal_display) { - switch ($action) { - case ConpherenceUpdateActions::METADATA: - $policy_objects = id(new PhabricatorPolicyQuery()) - ->setViewer($user) - ->setObject($conpherence) - ->execute(); - $header = $this->buildHeaderPaneContent( - $conpherence, - $policy_objects); - $header = hsprintf('%s', $header); - $nav_item = id(new ConpherenceThreadListView()) - ->setUser($user) - ->setBaseURI($this->getApplicationURI()) - ->renderSingleThread($conpherence, $policy_objects); - $nav_item = hsprintf('%s', $nav_item); - break; - case ConpherenceUpdateActions::ADD_PERSON: - $people_widget = id(new ConpherenceParticipantView()) - ->setUser($user) - ->setConpherence($conpherence) - ->setUpdateURI($update_uri); - $people_widget = hsprintf('%s', $people_widget->render()); - break; - case ConpherenceUpdateActions::REMOVE_PERSON: - case ConpherenceUpdateActions::NOTIFICATIONS: - default: - break; - } + switch ($action) { + case ConpherenceUpdateActions::METADATA: + $policy_objects = id(new PhabricatorPolicyQuery()) + ->setViewer($user) + ->setObject($conpherence) + ->execute(); + $header = $this->buildHeaderPaneContent( + $conpherence, + $policy_objects); + $header = hsprintf('%s', $header); + $nav_item = id(new ConpherenceThreadListView()) + ->setUser($user) + ->setBaseURI($this->getApplicationURI()) + ->renderSingleThread($conpherence, $policy_objects); + $nav_item = hsprintf('%s', $nav_item); + break; + case ConpherenceUpdateActions::ADD_PERSON: + $people_widget = id(new ConpherenceParticipantView()) + ->setUser($user) + ->setConpherence($conpherence) + ->setUpdateURI($update_uri); + $people_widget = hsprintf('%s', $people_widget->render()); + break; + case ConpherenceUpdateActions::REMOVE_PERSON: + case ConpherenceUpdateActions::NOTIFICATIONS: + default: + break; } $data = $conpherence->getDisplayData($user); $dropdown_query = id(new AphlictDropdownDataQuery()) diff --git a/src/applications/conpherence/controller/ConpherenceViewController.php b/src/applications/conpherence/controller/ConpherenceViewController.php --- a/src/applications/conpherence/controller/ConpherenceViewController.php +++ b/src/applications/conpherence/controller/ConpherenceViewController.php @@ -73,7 +73,6 @@ $data = ConpherenceTransactionRenderer::renderTransactions( $user, $conpherence, - $full_display = true, $marker_type); $messages = ConpherenceTransactionRenderer::renderMessagePaneContent( $data['transactions'], diff --git a/src/applications/conpherence/query/ConpherenceThreadSearchEngine.php b/src/applications/conpherence/query/ConpherenceThreadSearchEngine.php --- a/src/applications/conpherence/query/ConpherenceThreadSearchEngine.php +++ b/src/applications/conpherence/query/ConpherenceThreadSearchEngine.php @@ -199,7 +199,6 @@ ->setMarkupEngine($engines[$conpherence_phid]) ->setConpherenceThread($conpherence) ->setConpherenceTransaction($xaction) - ->setFullDisplay(true) ->addClass('conpherence-fulltext-result'); if ($message['match']) { diff --git a/src/applications/conpherence/view/ConpherenceDurableColumnView.php b/src/applications/conpherence/view/ConpherenceDurableColumnView.php --- a/src/applications/conpherence/view/ConpherenceDurableColumnView.php +++ b/src/applications/conpherence/view/ConpherenceDurableColumnView.php @@ -413,8 +413,7 @@ $data = ConpherenceTransactionRenderer::renderTransactions( $this->getUser(), - $conpherence, - $full_display = false); + $conpherence); $messages = ConpherenceTransactionRenderer::renderMessagePaneContent( $data['transactions'], $data['oldest_transaction_id'], diff --git a/src/applications/conpherence/view/ConpherenceTransactionView.php b/src/applications/conpherence/view/ConpherenceTransactionView.php --- a/src/applications/conpherence/view/ConpherenceTransactionView.php +++ b/src/applications/conpherence/view/ConpherenceTransactionView.php @@ -6,7 +6,6 @@ private $conpherenceTransaction; private $handles; private $markupEngine; - private $fullDisplay; private $classes = array(); private $timeOnly; @@ -47,15 +46,6 @@ return $this->markupEngine; } - public function setFullDisplay($bool) { - $this->fullDisplay = $bool; - return $this; - } - - private function getFullDisplay() { - return $this->fullDisplay; - } - public function addClass($class) { $this->classes[] = $class; return $this; @@ -100,11 +90,7 @@ $image = $this->renderTransactionImage(); $content = $this->renderTransactionContent(); $classes = implode(' ', $this->classes); - - $transaction_dom_id = null; - if ($this->getFullDisplay()) { - $transaction_dom_id = 'anchor-'.$transaction->getID(); - } + $transaction_dom_id = 'anchor-'.$transaction->getID(); $header = phutil_tag_div( 'conpherence-transaction-header grouped', @@ -137,42 +123,27 @@ $tip = phabricator_datetime($transaction->getDateCreated(), $viewer); $label = phabricator_time($transaction->getDateCreated(), $viewer); $width = 360; - if ($this->getFullDisplay()) { - Javelin::initBehavior('phabricator-watch-anchor'); - $anchor = id(new PhabricatorAnchorView()) - ->setAnchorName($transaction->getID()) - ->render(); - $info[] = hsprintf( - '%s%s', - $anchor, - javelin_tag( - 'a', - array( - 'href' => '#'.$transaction->getID(), - 'class' => 'anchor-link', - 'sigil' => 'has-tooltip', - 'meta' => array( - 'tip' => $tip, - 'size' => $width, - ), - ), - $label)); - } else { - $href = '/'.$thread->getMonogram().'#'.$transaction->getID(); - $info[] = javelin_tag( + Javelin::initBehavior('phabricator-watch-anchor'); + $anchor = id(new PhabricatorAnchorView()) + ->setAnchorName($transaction->getID()) + ->render(); + + $info[] = hsprintf( + '%s%s', + $anchor, + javelin_tag( 'a', array( - 'href' => $href, - 'class' => 'epoch-link', + 'href' => '#'.$transaction->getID(), + 'class' => 'anchor-link', 'sigil' => 'has-tooltip', 'meta' => array( 'tip' => $tip, 'size' => $width, ), ), - $label); - } + $label)); return phutil_tag( 'span', diff --git a/webroot/rsrc/css/application/conpherence/durable-column.css b/webroot/rsrc/css/application/conpherence/durable-column.css --- a/webroot/rsrc/css/application/conpherence/durable-column.css +++ b/webroot/rsrc/css/application/conpherence/durable-column.css @@ -205,28 +205,29 @@ word-wrap: break-word; } -.conpherence-durable-column-transactions .conpherence-transaction-detail { - border: 0; - margin: 0 0 0 32px; +.conpherence-durable-column-transactions .conpherence-transaction-view + .conpherence-transaction-detail { + border: 0; + margin: 0 0 0 32px; } -.conpherence-durable-column-transactions .conpherence-transaction-detail - .conpherence-transaction-header { +.conpherence-durable-column-transactions .conpherence-transaction-view + .conpherence-transaction-detail .conpherence-transaction-header { background: none; padding: 0 0 2px 0; } .conpherence-durable-column-transactions -.conpherence-transaction-view.date-marker { - margin: 12px 0 0; + .conpherence-transaction-view.date-marker { + margin: 12px 0 0; } .conpherence-durable-column-transactions -.conpherence-transaction-view.date-marker .date { - left: 0; - font-size: {$normalfontsize}; - top: -14px; - padding: 0 6px 0 0; + .conpherence-transaction-view.date-marker .date { + left: 0; + font-size: {$normalfontsize}; + top: -10px; + padding: 0 6px 0 0; } .conpherence-durable-column-transactions .conpherence-transaction-detail diff --git a/webroot/rsrc/js/application/conpherence/ConpherenceThreadManager.js b/webroot/rsrc/js/application/conpherence/ConpherenceThreadManager.js --- a/webroot/rsrc/js/application/conpherence/ConpherenceThreadManager.js +++ b/webroot/rsrc/js/application/conpherence/ConpherenceThreadManager.js @@ -31,7 +31,6 @@ _transactionCache: null, _canEditLoadedThread: null, _updating: null, - _minimalDisplay: false, _messagesRootCallback: JX.bag, _willLoadThreadCallback: JX.bag, _didLoadThreadCallback: JX.bag, @@ -150,11 +149,6 @@ return this._canEditLoadedThread; }, - setMinimalDisplay: function(bool) { - this._minimalDisplay = bool; - return this; - }, - setMessagesRootCallback: function(callback) { this._messagesRootCallback = callback; return this; @@ -196,9 +190,6 @@ }, _getParams: function(base_params) { - if (this._minimalDisplay) { - base_params.minimal_display = true; - } if (this._latestTransactionID) { base_params.latest_transaction_id = this._latestTransactionID; } 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 @@ -114,7 +114,6 @@ */ var threadManager = new JX.ConpherenceThreadManager(); - threadManager.setMinimalDisplay(true); threadManager.setMessagesRootCallback(function() { return _getColumnMessagesNode(); }); @@ -282,7 +281,7 @@ function _sendMessage(e) { e.kill(); var form = _getColumnFormNode(); - threadManager.sendMessage(form, { minimal_display: true }); + threadManager.sendMessage(form, {}); } JX.Stratcom.listen(