mirror of
https://we.phorge.it/source/phorge.git
synced 2024-12-25 06:50:55 +01:00
Merge branch 'master' of github.com:facebook/phabricator
Conflicts: src/__celerity_resource_map__.php
This commit is contained in:
Chad Little
commit
be544e0298
3 changed files with 39 additions and 64 deletions
|
|
@ -1578,7 +1578,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(
|
||||
|
|
@ -3264,7 +3264,7 @@ celerity_register_resource_map(array(
|
|||
'uri' => '/res/pkg/aee02c57/core.pkg.css',
|
||||
'type' => 'css',
|
||||
),
|
||||
'b239ff06' =>
|
||||
'da3a7729' =>
|
||||
array(
|
||||
'name' => 'core.pkg.js',
|
||||
'symbols' =>
|
||||
|
|
@ -3302,7 +3302,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' =>
|
||||
|
|
@ -3478,18 +3478,18 @@ celerity_register_resource_map(array(
|
|||
'diffusion-icons-css' => 'c8ce2d88',
|
||||
'global-drag-and-drop-css' => 'aee02c57',
|
||||
'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 +3505,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',
|
||||
|
|
@ -3548,39 +3548,39 @@ celerity_register_resource_map(array(
|
|||
'lightbox-attachment-css' => 'aee02c57',
|
||||
'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' => 'aee02c57',
|
||||
'phabricator-core-css' => 'aee02c57',
|
||||
'phabricator-crumbs-view-css' => 'aee02c57',
|
||||
'phabricator-directory-css' => 'aee02c57',
|
||||
'phabricator-drag-and-drop-file-upload' => 'bbd79ca2',
|
||||
'phabricator-dropdown-menu' => 'b239ff06',
|
||||
'phabricator-file-upload' => 'b239ff06',
|
||||
'phabricator-dropdown-menu' => 'da3a7729',
|
||||
'phabricator-file-upload' => 'da3a7729',
|
||||
'phabricator-filetree-view-css' => 'aee02c57',
|
||||
'phabricator-flag-css' => 'aee02c57',
|
||||
'phabricator-form-view-css' => 'aee02c57',
|
||||
'phabricator-header-view-css' => 'aee02c57',
|
||||
'phabricator-jump-nav' => 'aee02c57',
|
||||
'phabricator-keyboard-shortcut' => 'b239ff06',
|
||||
'phabricator-keyboard-shortcut-manager' => 'b239ff06',
|
||||
'phabricator-keyboard-shortcut' => 'da3a7729',
|
||||
'phabricator-keyboard-shortcut-manager' => 'da3a7729',
|
||||
'phabricator-main-menu-view' => 'aee02c57',
|
||||
'phabricator-menu-item' => 'b239ff06',
|
||||
'phabricator-menu-item' => 'da3a7729',
|
||||
'phabricator-nav-view-css' => 'aee02c57',
|
||||
'phabricator-notification' => 'b239ff06',
|
||||
'phabricator-notification' => 'da3a7729',
|
||||
'phabricator-notification-css' => 'aee02c57',
|
||||
'phabricator-notification-menu-css' => 'aee02c57',
|
||||
'phabricator-object-item-list-view-css' => 'aee02c57',
|
||||
'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' => 'aee02c57',
|
||||
'phabricator-shaped-request' => 'bbd79ca2',
|
||||
'phabricator-side-menu-view-css' => 'aee02c57',
|
||||
'phabricator-standard-page-view' => 'aee02c57',
|
||||
'phabricator-textareautils' => 'b239ff06',
|
||||
'phabricator-tooltip' => 'b239ff06',
|
||||
'phabricator-textareautils' => 'da3a7729',
|
||||
'phabricator-tooltip' => 'da3a7729',
|
||||
'phabricator-transaction-view-css' => 'aee02c57',
|
||||
'phabricator-zindex-css' => 'aee02c57',
|
||||
'sprite-apps-large-css' => 'aee02c57',
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
}
|
||||
|
||||
$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(
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
|
||||
});
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue