From f74c2bb13892d35f8b577aca6b2c930da40c2be4 Mon Sep 17 00:00:00 2001 From: vrana Date: Mon, 14 Jan 2013 13:22:02 -0800 Subject: [PATCH 1/2] Optimize displaying info about lint messages Summary: Log of some FB paths takes over 10 seconds. We query two logs only to get accurate message about lint info which is not that important. Test Plan: Displayed and clicked on it. Reviewers: nh, epriestley Reviewed By: epriestley CC: aran, Korvin Differential Revision: https://secure.phabricator.com/D4429 --- .../DiffusionBrowseFileController.php | 31 ++----------------- 1 file changed, 3 insertions(+), 28 deletions(-) diff --git a/src/applications/diffusion/controller/DiffusionBrowseFileController.php b/src/applications/diffusion/controller/DiffusionBrowseFileController.php index 3729ce9c60..81d187baed 100644 --- a/src/applications/diffusion/controller/DiffusionBrowseFileController.php +++ b/src/applications/diffusion/controller/DiffusionBrowseFileController.php @@ -133,25 +133,7 @@ final class DiffusionBrowseFileController extends DiffusionController { return; } - $file_history = DiffusionHistoryQuery::newFromDiffusionRequest( - $drequest)->setLimit(1)->loadHistory(); - - $lint_request = clone $drequest; - $lint_request->setCommit($branch->getLintCommit()); - try { - $lint_history = DiffusionHistoryQuery::newFromDiffusionRequest( - $lint_request)->setLimit(1)->loadHistory(); - } catch (Exception $ex) { - // This can happen if lintCommit is invalid. - $lint_history = null; - } - - $this->lintCommit = ''; - if (!$file_history || !$lint_history || - reset($file_history)->getCommitIdentifier() != - reset($lint_history)->getCommitIdentifier()) { - $this->lintCommit = $branch->getLintCommit(); - } + $this->lintCommit = $branch->getLintCommit(); $conn = id(new PhabricatorRepository())->establishConnection('r'); @@ -355,21 +337,14 @@ final class DiffusionBrowseFileController extends DiffusionController { } else if ($this->lintCommit === null) { $lint_text = pht('Lint not Available'); - } else if ($this->lintCommit) { + } else { $lint_text = pht( - 'Switch for %d Lint Message(s)', + 'Show %d Lint Message(s)', count($this->lintMessages)); $href = $this->getDiffusionRequest()->generateURI(array( 'action' => 'browse', 'commit' => $this->lintCommit, ))->alter('lint', ''); - - } else if (!$this->lintMessages) { - $lint_text = pht('No Lint Messages'); - - } else { - $lint_text = pht('Show %d Lint Message(s)', count($this->lintMessages)); - $href = $base_uri->alter('lint', ''); } $lint_button = $this->createViewAction( From 61057a9025f43c6ade6a29d1b72c03a497b8c1e0 Mon Sep 17 00:00:00 2001 From: epriestley Date: Tue, 15 Jan 2013 18:47:51 -0800 Subject: [PATCH 2/2] Fix filetree collapse Summary: We need to nuke `has-drag-nav` too when the user presses "F" in Differential/Diffusion. Test Plan: Pressed "F" in Differential. Reviewers: zeeg, chad, btrahan Reviewed By: chad CC: aran Differential Revision: https://secure.phabricator.com/D4457 --- src/__celerity_resource_map__.php | 165 +++++++++--------- .../core/behavior-phabricator-nav.js | 2 +- 2 files changed, 80 insertions(+), 87 deletions(-) diff --git a/src/__celerity_resource_map__.php b/src/__celerity_resource_map__.php index 5af877cc16..7200820521 100644 --- a/src/__celerity_resource_map__.php +++ b/src/__celerity_resource_map__.php @@ -504,17 +504,10 @@ celerity_register_resource_map(array( 'disk' => '/rsrc/image/sprite-menu.png', 'type' => 'png', ), - '/rsrc/image/texture/dark-menu-hover.png' => - array( - 'hash' => 'a214a732644be34872e895b338b5d639', - 'uri' => '/res/a214a732/rsrc/image/texture/dark-menu-hover.png', - 'disk' => '/rsrc/image/texture/dark-menu-hover.png', - 'type' => 'png', - ), '/rsrc/image/texture/dark-menu.png' => array( - 'hash' => '41ee673a762cec48a154b456ad5ac204', - 'uri' => '/res/41ee673a/rsrc/image/texture/dark-menu.png', + 'hash' => '41dfbdfba88ba361c72bbf289396200c', + 'uri' => '/res/41dfbdfb/rsrc/image/texture/dark-menu.png', 'disk' => '/rsrc/image/texture/dark-menu.png', 'type' => 'png', ), @@ -1578,7 +1571,7 @@ celerity_register_resource_map(array( ), 'javelin-behavior-phabricator-nav' => array( - 'uri' => '/res/1aa9aa6f/rsrc/js/application/core/behavior-phabricator-nav.js', + 'uri' => '/res/cec31f3f/rsrc/js/application/core/behavior-phabricator-nav.js', 'type' => 'js', 'requires' => array( @@ -2388,7 +2381,7 @@ celerity_register_resource_map(array( ), 'phabricator-application-launch-view-css' => array( - 'uri' => '/res/b3e5d264/rsrc/css/application/base/phabricator-application-launch-view.css', + 'uri' => '/res/0a673db0/rsrc/css/application/base/phabricator-application-launch-view.css', 'type' => 'css', 'requires' => array( @@ -2593,7 +2586,7 @@ celerity_register_resource_map(array( ), 'phabricator-main-menu-view' => array( - 'uri' => '/res/a38edb46/rsrc/css/application/base/main-menu-view.css', + 'uri' => '/res/5c89ac89/rsrc/css/application/base/main-menu-view.css', 'type' => 'css', 'requires' => array( @@ -3217,7 +3210,7 @@ celerity_register_resource_map(array( ), array( 'packages' => array( - 'acc1014b' => + '1fa53f94' => array( 'name' => 'core.pkg.css', 'symbols' => @@ -3261,10 +3254,10 @@ celerity_register_resource_map(array( 36 => 'phabricator-object-item-list-view-css', 37 => 'global-drag-and-drop-css', ), - 'uri' => '/res/pkg/acc1014b/core.pkg.css', + 'uri' => '/res/pkg/1fa53f94/core.pkg.css', 'type' => 'css', ), - 'b239ff06' => + 'da3a7729' => array( 'name' => 'core.pkg.js', 'symbols' => @@ -3302,7 +3295,7 @@ celerity_register_resource_map(array( 30 => 'phabricator-file-upload', 31 => 'javelin-behavior-global-drag-and-drop', ), - 'uri' => '/res/pkg/b239ff06/core.pkg.js', + 'uri' => '/res/pkg/da3a7729/core.pkg.js', 'type' => 'js', ), '8edbada5' => @@ -3450,19 +3443,19 @@ celerity_register_resource_map(array( 'reverse' => array( 'aphront-attached-file-view-css' => 'ac211174', - 'aphront-crumbs-view-css' => 'acc1014b', - 'aphront-dialog-view-css' => 'acc1014b', - 'aphront-error-view-css' => 'acc1014b', - 'aphront-form-view-css' => 'acc1014b', + 'aphront-crumbs-view-css' => '1fa53f94', + 'aphront-dialog-view-css' => '1fa53f94', + 'aphront-error-view-css' => '1fa53f94', + 'aphront-form-view-css' => '1fa53f94', 'aphront-headsup-action-list-view-css' => 'ec01d039', - 'aphront-headsup-view-css' => 'acc1014b', - 'aphront-list-filter-view-css' => 'acc1014b', - 'aphront-pager-view-css' => 'acc1014b', - 'aphront-panel-view-css' => 'acc1014b', - 'aphront-table-view-css' => 'acc1014b', - 'aphront-tokenizer-control-css' => 'acc1014b', - 'aphront-tooltip-css' => 'acc1014b', - 'aphront-typeahead-control-css' => 'acc1014b', + 'aphront-headsup-view-css' => '1fa53f94', + 'aphront-list-filter-view-css' => '1fa53f94', + 'aphront-pager-view-css' => '1fa53f94', + 'aphront-panel-view-css' => '1fa53f94', + 'aphront-table-view-css' => '1fa53f94', + 'aphront-tokenizer-control-css' => '1fa53f94', + 'aphront-tooltip-css' => '1fa53f94', + 'aphront-typeahead-control-css' => '1fa53f94', 'differential-changeset-view-css' => 'ec01d039', 'differential-core-view-css' => 'ec01d039', 'differential-inline-comment-editor' => 'bbd79ca2', @@ -3476,20 +3469,20 @@ celerity_register_resource_map(array( 'differential-table-of-contents-css' => 'ec01d039', 'diffusion-commit-view-css' => 'c8ce2d88', 'diffusion-icons-css' => 'c8ce2d88', - 'global-drag-and-drop-css' => 'acc1014b', + 'global-drag-and-drop-css' => '1fa53f94', 'inline-comment-summary-css' => 'ec01d039', - 'javelin-aphlict' => 'b239ff06', + 'javelin-aphlict' => 'da3a7729', 'javelin-behavior' => 'fbeded59', - 'javelin-behavior-aphlict-dropdown' => 'b239ff06', - 'javelin-behavior-aphlict-listen' => 'b239ff06', - 'javelin-behavior-aphront-basic-tokenizer' => 'b239ff06', + 'javelin-behavior-aphlict-dropdown' => 'da3a7729', + 'javelin-behavior-aphlict-listen' => 'da3a7729', + 'javelin-behavior-aphront-basic-tokenizer' => 'da3a7729', 'javelin-behavior-aphront-drag-and-drop' => 'bbd79ca2', 'javelin-behavior-aphront-drag-and-drop-textarea' => 'bbd79ca2', - 'javelin-behavior-aphront-form-disable-on-submit' => 'b239ff06', + 'javelin-behavior-aphront-form-disable-on-submit' => 'da3a7729', 'javelin-behavior-audit-preview' => 'f96657b8', 'javelin-behavior-dark-console' => '8edbada5', 'javelin-behavior-dark-console-ajax' => '8edbada5', - 'javelin-behavior-device' => 'b239ff06', + 'javelin-behavior-device' => 'da3a7729', 'javelin-behavior-differential-accept-with-errors' => 'bbd79ca2', 'javelin-behavior-differential-add-reviewers-and-ccs' => 'bbd79ca2', 'javelin-behavior-differential-comment-jump' => 'bbd79ca2', @@ -3505,28 +3498,28 @@ celerity_register_resource_map(array( 'javelin-behavior-diffusion-commit-graph' => 'f96657b8', 'javelin-behavior-diffusion-pull-lastmodified' => 'f96657b8', 'javelin-behavior-error-log' => '8edbada5', - 'javelin-behavior-global-drag-and-drop' => 'b239ff06', - 'javelin-behavior-konami' => 'b239ff06', - 'javelin-behavior-lightbox-attachments' => 'b239ff06', + 'javelin-behavior-global-drag-and-drop' => 'da3a7729', + 'javelin-behavior-konami' => 'da3a7729', + 'javelin-behavior-lightbox-attachments' => 'da3a7729', 'javelin-behavior-maniphest-batch-selector' => '7707de41', 'javelin-behavior-maniphest-subpriority-editor' => '7707de41', 'javelin-behavior-maniphest-transaction-controls' => '7707de41', 'javelin-behavior-maniphest-transaction-expand' => '7707de41', 'javelin-behavior-maniphest-transaction-preview' => '7707de41', - 'javelin-behavior-phabricator-active-nav' => 'b239ff06', - 'javelin-behavior-phabricator-autofocus' => 'b239ff06', - 'javelin-behavior-phabricator-keyboard-shortcuts' => 'b239ff06', - 'javelin-behavior-phabricator-nav' => 'b239ff06', + 'javelin-behavior-phabricator-active-nav' => 'da3a7729', + 'javelin-behavior-phabricator-autofocus' => 'da3a7729', + 'javelin-behavior-phabricator-keyboard-shortcuts' => 'da3a7729', + 'javelin-behavior-phabricator-nav' => 'da3a7729', 'javelin-behavior-phabricator-object-selector' => 'bbd79ca2', - 'javelin-behavior-phabricator-oncopy' => 'b239ff06', - 'javelin-behavior-phabricator-remarkup-assist' => 'b239ff06', - 'javelin-behavior-phabricator-search-typeahead' => 'b239ff06', - 'javelin-behavior-phabricator-tooltips' => 'b239ff06', - 'javelin-behavior-phabricator-watch-anchor' => 'b239ff06', - 'javelin-behavior-refresh-csrf' => 'b239ff06', + 'javelin-behavior-phabricator-oncopy' => 'da3a7729', + 'javelin-behavior-phabricator-remarkup-assist' => 'da3a7729', + 'javelin-behavior-phabricator-search-typeahead' => 'da3a7729', + 'javelin-behavior-phabricator-tooltips' => 'da3a7729', + 'javelin-behavior-phabricator-watch-anchor' => 'da3a7729', + 'javelin-behavior-refresh-csrf' => 'da3a7729', 'javelin-behavior-repository-crossreference' => 'bbd79ca2', - 'javelin-behavior-toggle-class' => 'b239ff06', - 'javelin-behavior-workflow' => 'b239ff06', + 'javelin-behavior-toggle-class' => 'da3a7729', + 'javelin-behavior-workflow' => 'da3a7729', 'javelin-dom' => 'fbeded59', 'javelin-event' => 'fbeded59', 'javelin-install' => 'fbeded59', @@ -3545,48 +3538,48 @@ celerity_register_resource_map(array( 'javelin-util' => 'fbeded59', 'javelin-vector' => 'fbeded59', 'javelin-workflow' => 'fbeded59', - 'lightbox-attachment-css' => 'acc1014b', + 'lightbox-attachment-css' => '1fa53f94', 'maniphest-task-summary-css' => 'ac211174', 'maniphest-transaction-detail-css' => 'ac211174', - 'phabricator-busy' => 'b239ff06', + 'phabricator-busy' => 'da3a7729', 'phabricator-content-source-view-css' => 'ec01d039', - 'phabricator-core-buttons-css' => 'acc1014b', - 'phabricator-core-css' => 'acc1014b', - 'phabricator-crumbs-view-css' => 'acc1014b', - 'phabricator-directory-css' => 'acc1014b', + 'phabricator-core-buttons-css' => '1fa53f94', + 'phabricator-core-css' => '1fa53f94', + 'phabricator-crumbs-view-css' => '1fa53f94', + 'phabricator-directory-css' => '1fa53f94', 'phabricator-drag-and-drop-file-upload' => 'bbd79ca2', - 'phabricator-dropdown-menu' => 'b239ff06', - 'phabricator-file-upload' => 'b239ff06', - 'phabricator-filetree-view-css' => 'acc1014b', - 'phabricator-flag-css' => 'acc1014b', - 'phabricator-form-view-css' => 'acc1014b', - 'phabricator-header-view-css' => 'acc1014b', - 'phabricator-jump-nav' => 'acc1014b', - 'phabricator-keyboard-shortcut' => 'b239ff06', - 'phabricator-keyboard-shortcut-manager' => 'b239ff06', - 'phabricator-main-menu-view' => 'acc1014b', - 'phabricator-menu-item' => 'b239ff06', - 'phabricator-nav-view-css' => 'acc1014b', - 'phabricator-notification' => 'b239ff06', - 'phabricator-notification-css' => 'acc1014b', - 'phabricator-notification-menu-css' => 'acc1014b', - 'phabricator-object-item-list-view-css' => 'acc1014b', + 'phabricator-dropdown-menu' => 'da3a7729', + 'phabricator-file-upload' => 'da3a7729', + 'phabricator-filetree-view-css' => '1fa53f94', + 'phabricator-flag-css' => '1fa53f94', + 'phabricator-form-view-css' => '1fa53f94', + 'phabricator-header-view-css' => '1fa53f94', + 'phabricator-jump-nav' => '1fa53f94', + 'phabricator-keyboard-shortcut' => 'da3a7729', + 'phabricator-keyboard-shortcut-manager' => 'da3a7729', + 'phabricator-main-menu-view' => '1fa53f94', + 'phabricator-menu-item' => 'da3a7729', + 'phabricator-nav-view-css' => '1fa53f94', + 'phabricator-notification' => 'da3a7729', + 'phabricator-notification-css' => '1fa53f94', + 'phabricator-notification-menu-css' => '1fa53f94', + 'phabricator-object-item-list-view-css' => '1fa53f94', 'phabricator-object-selector-css' => 'ec01d039', - 'phabricator-paste-file-upload' => 'b239ff06', - 'phabricator-prefab' => 'b239ff06', + 'phabricator-paste-file-upload' => 'da3a7729', + 'phabricator-prefab' => 'da3a7729', 'phabricator-project-tag-css' => 'ac211174', - 'phabricator-remarkup-css' => 'acc1014b', + 'phabricator-remarkup-css' => '1fa53f94', 'phabricator-shaped-request' => 'bbd79ca2', - 'phabricator-side-menu-view-css' => 'acc1014b', - 'phabricator-standard-page-view' => 'acc1014b', - 'phabricator-textareautils' => 'b239ff06', - 'phabricator-tooltip' => 'b239ff06', - 'phabricator-transaction-view-css' => 'acc1014b', - 'phabricator-zindex-css' => 'acc1014b', - 'sprite-apps-large-css' => 'acc1014b', - 'sprite-gradient-css' => 'acc1014b', - 'sprite-icon-css' => 'acc1014b', - 'sprite-menu-css' => 'acc1014b', - 'syntax-highlighting-css' => 'acc1014b', + 'phabricator-side-menu-view-css' => '1fa53f94', + 'phabricator-standard-page-view' => '1fa53f94', + 'phabricator-textareautils' => 'da3a7729', + 'phabricator-tooltip' => 'da3a7729', + 'phabricator-transaction-view-css' => '1fa53f94', + 'phabricator-zindex-css' => '1fa53f94', + 'sprite-apps-large-css' => '1fa53f94', + 'sprite-gradient-css' => '1fa53f94', + 'sprite-icon-css' => '1fa53f94', + 'sprite-menu-css' => '1fa53f94', + 'syntax-highlighting-css' => '1fa53f94', ), )); diff --git a/webroot/rsrc/js/application/core/behavior-phabricator-nav.js b/webroot/rsrc/js/application/core/behavior-phabricator-nav.js index c120c8fd52..eae6708061 100644 --- a/webroot/rsrc/js/application/core/behavior-phabricator-nav.js +++ b/webroot/rsrc/js/application/core/behavior-phabricator-nav.js @@ -113,8 +113,8 @@ JX.behavior('phabricator-nav', function(config) { JX.Stratcom.listen('differential-filetree-toggle', null, function(e) { collapsed = !collapsed; JX.DOM.alterClass(main, 'has-local-nav', !collapsed); + JX.DOM.alterClass(main, 'has-drag-nav', !collapsed); resetdrag(); - });