@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.)
hq.recaptime.dev/wiki/Phorge
phorge
phabricator
Entirely replace the old filetree UI with the "flank" UI
Summary:
Ref T13516. Deletes all old filetree / flex / active / collapse nav code in favor of the new code.
Restores the inline tips in the path tree.
Test Plan: {F7374175}
Maniphest Tasks: T13516
Differential Revision: https://secure.phabricator.com/D21154
+121
-896
+38
-71
resources/celerity/map.php
+38
-71
resources/celerity/map.php
···
9
9
'names' => array(
10
10
'conpherence.pkg.css' => '3c8a0668',
11
11
'conpherence.pkg.js' => '020aebcf',
12
-
'core.pkg.css' => 'a4a2417c',
13
-
'core.pkg.js' => 'd092ddaf',
14
-
'differential.pkg.css' => '607c84be',
15
-
'differential.pkg.js' => '58e09368',
12
+
'core.pkg.css' => '4d5d0922',
13
+
'core.pkg.js' => '544bc792',
14
+
'differential.pkg.css' => 'cb99cd21',
15
+
'differential.pkg.js' => 'b3589d05',
16
16
'diffusion.pkg.css' => '42c75c37',
17
17
'diffusion.pkg.js' => 'a98c0bf7',
18
18
'maniphest.pkg.css' => '35995d6d',
···
29
29
'rsrc/css/aphront/multi-column.css' => 'fbc00ba3',
30
30
'rsrc/css/aphront/notification.css' => '30240bd2',
31
31
'rsrc/css/aphront/panel-view.css' => '46923d46',
32
-
'rsrc/css/aphront/phabricator-nav-view.css' => 'f8a0c1bf',
32
+
'rsrc/css/aphront/phabricator-nav-view.css' => '423f92cc',
33
33
'rsrc/css/aphront/table-view.css' => '0bb61df1',
34
34
'rsrc/css/aphront/tokenizer.css' => '34e2a838',
35
35
'rsrc/css/aphront/tooltip.css' => 'e3f2412f',
···
40
40
'rsrc/css/application/base/main-menu-view.css' => 'bcec20f0',
41
41
'rsrc/css/application/base/notification-menu.css' => '4df1ee30',
42
42
'rsrc/css/application/base/phui-theme.css' => '35883b37',
43
-
'rsrc/css/application/base/standard-page-view.css' => 'ed076e5a',
43
+
'rsrc/css/application/base/standard-page-view.css' => 'a374f94c',
44
44
'rsrc/css/application/chatlog/chatlog.css' => 'abdc76ee',
45
45
'rsrc/css/application/conduit/conduit-api.css' => 'ce2cfc41',
46
46
'rsrc/css/application/config/config-options.css' => '16c920ae',
···
59
59
'rsrc/css/application/countdown/timer.css' => 'bff8012f',
60
60
'rsrc/css/application/daemon/bulk-job.css' => '73af99f5',
61
61
'rsrc/css/application/dashboard/dashboard.css' => '5a205b9d',
62
-
'rsrc/css/application/diff/diff-tree-view.css' => 'ce58c3d1',
62
+
'rsrc/css/application/diff/diff-tree-view.css' => '8f487a99',
63
63
'rsrc/css/application/diff/inline-comment-summary.css' => '81eb368d',
64
64
'rsrc/css/application/differential/add-comment.css' => '7e5900d9',
65
65
'rsrc/css/application/differential/changeset-view.css' => '489b6995',
···
115
115
'rsrc/css/core/core.css' => '1b29ed61',
116
116
'rsrc/css/core/remarkup.css' => 'c286eaef',
117
117
'rsrc/css/core/syntax.css' => '220b85f9',
118
-
'rsrc/css/core/z-index.css' => '99c0f5eb',
118
+
'rsrc/css/core/z-index.css' => '612e9522',
119
119
'rsrc/css/diviner/diviner-shared.css' => '4bd263b0',
120
120
'rsrc/css/font/font-awesome.css' => '3883938a',
121
121
'rsrc/css/font/font-lato.css' => '23631304',
122
122
'rsrc/css/font/phui-font-icon-base.css' => 'd7994e06',
123
-
'rsrc/css/layout/phabricator-filetree-view.css' => '56cdd875',
124
123
'rsrc/css/layout/phabricator-source-code-view.css' => '03d7ac28',
125
124
'rsrc/css/phui/button/phui-button-bar.css' => 'a4aa75c4',
126
125
'rsrc/css/phui/button/phui-button-simple.css' => '1ff278aa',
···
379
378
'rsrc/js/application/dashboard/behavior-dashboard-move-panels.js' => 'a2ab19be',
380
379
'rsrc/js/application/dashboard/behavior-dashboard-query-panel-select.js' => '1e413dc9',
381
380
'rsrc/js/application/dashboard/behavior-dashboard-tab-panel.js' => '0116d3e8',
382
-
'rsrc/js/application/diff/DiffChangeset.js' => 'ea6e377d',
383
-
'rsrc/js/application/diff/DiffChangesetList.js' => '5a351998',
381
+
'rsrc/js/application/diff/DiffChangeset.js' => '2a3101b1',
382
+
'rsrc/js/application/diff/DiffChangesetList.js' => '57035863',
384
383
'rsrc/js/application/diff/DiffInline.js' => '16e97ebc',
385
-
'rsrc/js/application/diff/DiffPathView.js' => '8337f4c7',
384
+
'rsrc/js/application/diff/DiffPathView.js' => 'c0ed32ce',
386
385
'rsrc/js/application/diff/DiffTreeView.js' => 'a5823e4d',
387
386
'rsrc/js/application/diff/behavior-preview-link.js' => 'f51e9c17',
388
387
'rsrc/js/application/differential/behavior-diff-radios.js' => '925fe8cd',
···
466
465
'rsrc/js/core/TextAreaUtils.js' => 'f340a484',
467
466
'rsrc/js/core/Title.js' => '43bc9360',
468
467
'rsrc/js/core/ToolTip.js' => '83754533',
469
-
'rsrc/js/core/behavior-active-nav.js' => '7353f43d',
470
468
'rsrc/js/core/behavior-audio-source.js' => '3dc5ad43',
471
469
'rsrc/js/core/behavior-autofocus.js' => '65bb0011',
472
470
'rsrc/js/core/behavior-badge-view.js' => '92cdd7b6',
···
477
475
'rsrc/js/core/behavior-device.js' => '0cf79f45',
478
476
'rsrc/js/core/behavior-drag-and-drop-textarea.js' => '7ad020a5',
479
477
'rsrc/js/core/behavior-fancy-datepicker.js' => '956f3eeb',
480
-
'rsrc/js/core/behavior-file-tree.js' => 'a61c2d11',
481
478
'rsrc/js/core/behavior-form.js' => '55d7b788',
482
479
'rsrc/js/core/behavior-gesture.js' => 'b58d1a2a',
483
480
'rsrc/js/core/behavior-global-drag-and-drop.js' => '1cab0e9a',
···
492
489
'rsrc/js/core/behavior-more.js' => '506aa3f4',
493
490
'rsrc/js/core/behavior-object-selector.js' => '98ef467f',
494
491
'rsrc/js/core/behavior-oncopy.js' => 'ff7b3f22',
495
-
'rsrc/js/core/behavior-phabricator-nav.js' => 'f166c949',
496
492
'rsrc/js/core/behavior-phabricator-remarkup-assist.js' => '54262396',
497
493
'rsrc/js/core/behavior-read-only-warning.js' => 'b9109f8f',
498
494
'rsrc/js/core/behavior-redirect.js' => '407ee861',
···
562
558
'conpherence-thread-manager' => 'aec8e38c',
563
559
'conpherence-transaction-css' => '3a3f5e7e',
564
560
'd3' => '9d068042',
565
-
'diff-tree-view-css' => 'ce58c3d1',
561
+
'diff-tree-view-css' => '8f487a99',
566
562
'differential-changeset-view-css' => '489b6995',
567
563
'differential-core-view-css' => '7300a73e',
568
564
'differential-revision-add-comment-css' => '7e5900d9',
···
644
640
'javelin-behavior-maniphest-list-editor' => 'c687e867',
645
641
'javelin-behavior-owners-path-editor' => 'ff688a7a',
646
642
'javelin-behavior-passphrase-credential-control' => '48fe33d0',
647
-
'javelin-behavior-phabricator-active-nav' => '7353f43d',
648
643
'javelin-behavior-phabricator-autofocus' => '65bb0011',
649
644
'javelin-behavior-phabricator-clipboard-copy' => 'cf32921f',
650
-
'javelin-behavior-phabricator-file-tree' => 'a61c2d11',
651
645
'javelin-behavior-phabricator-gesture' => 'b58d1a2a',
652
646
'javelin-behavior-phabricator-gesture-example' => '242dedd0',
653
647
'javelin-behavior-phabricator-keyboard-pager' => '1325b731',
654
648
'javelin-behavior-phabricator-keyboard-shortcuts' => '42c44e8b',
655
649
'javelin-behavior-phabricator-line-linker' => '590e6527',
656
-
'javelin-behavior-phabricator-nav' => 'f166c949',
657
650
'javelin-behavior-phabricator-notification-example' => '29819b75',
658
651
'javelin-behavior-phabricator-object-selector' => '98ef467f',
659
652
'javelin-behavior-phabricator-oncopy' => 'ff7b3f22',
···
782
775
'phabricator-darklog' => '3b869402',
783
776
'phabricator-darkmessage' => '26cd4b73',
784
777
'phabricator-dashboard-css' => '5a205b9d',
785
-
'phabricator-diff-changeset' => 'ea6e377d',
786
-
'phabricator-diff-changeset-list' => '5a351998',
778
+
'phabricator-diff-changeset' => '2a3101b1',
779
+
'phabricator-diff-changeset-list' => '57035863',
787
780
'phabricator-diff-inline' => '16e97ebc',
788
-
'phabricator-diff-path-view' => '8337f4c7',
781
+
'phabricator-diff-path-view' => 'c0ed32ce',
789
782
'phabricator-diff-tree-view' => 'a5823e4d',
790
783
'phabricator-drag-and-drop-file-upload' => '4370900d',
791
784
'phabricator-draggable-list' => '0169e425',
···
793
786
'phabricator-favicon' => '7930776a',
794
787
'phabricator-feed-css' => 'd8b6e3f8',
795
788
'phabricator-file-upload' => 'ab85e184',
796
-
'phabricator-filetree-view-css' => '56cdd875',
797
789
'phabricator-flag-css' => '2b77be8d',
798
790
'phabricator-keyboard-shortcut' => '1a844c06',
799
791
'phabricator-keyboard-shortcut-manager' => '81debc48',
800
792
'phabricator-main-menu-view' => 'bcec20f0',
801
-
'phabricator-nav-view-css' => 'f8a0c1bf',
793
+
'phabricator-nav-view-css' => '423f92cc',
802
794
'phabricator-notification' => 'a9b91e3f',
803
795
'phabricator-notification-css' => '30240bd2',
804
796
'phabricator-notification-menu-css' => '4df1ee30',
···
810
802
'phabricator-shaped-request' => 'abf88db8',
811
803
'phabricator-slowvote-css' => '1694baed',
812
804
'phabricator-source-code-view-css' => '03d7ac28',
813
-
'phabricator-standard-page-view' => 'ed076e5a',
805
+
'phabricator-standard-page-view' => 'a374f94c',
814
806
'phabricator-textareautils' => 'f340a484',
815
807
'phabricator-title' => '43bc9360',
816
808
'phabricator-tooltip' => '83754533',
817
809
'phabricator-ui-example-css' => 'b4795059',
818
-
'phabricator-zindex-css' => '99c0f5eb',
810
+
'phabricator-zindex-css' => '612e9522',
819
811
'phame-css' => 'bb442327',
820
812
'pholio-css' => '88ef5ef1',
821
813
'pholio-edit-css' => '4df55b3b',
···
1163
1155
'javelin-stratcom',
1164
1156
'javelin-behavior',
1165
1157
),
1158
+
'2a3101b1' => array(
1159
+
'javelin-dom',
1160
+
'javelin-util',
1161
+
'javelin-stratcom',
1162
+
'javelin-install',
1163
+
'javelin-workflow',
1164
+
'javelin-router',
1165
+
'javelin-behavior-device',
1166
+
'javelin-vector',
1167
+
'phabricator-diff-inline',
1168
+
'phabricator-diff-path-view',
1169
+
),
1166
1170
'2a8b62d9' => array(
1167
1171
'multirow-row-manager',
1168
1172
'javelin-install',
···
1432
1436
'javelin-stratcom',
1433
1437
'javelin-dom',
1434
1438
),
1439
+
57035863 => array(
1440
+
'javelin-install',
1441
+
'phuix-button-view',
1442
+
'phabricator-diff-tree-view',
1443
+
),
1435
1444
'5793d835' => array(
1436
1445
'javelin-install',
1437
1446
'javelin-util',
···
1471
1480
'javelin-stratcom',
1472
1481
'javelin-dom',
1473
1482
'javelin-history',
1474
-
),
1475
-
'5a351998' => array(
1476
-
'javelin-install',
1477
-
'phuix-button-view',
1478
-
'phabricator-diff-tree-view',
1479
1483
),
1480
1484
'5a6f6a06' => array(
1481
1485
'javelin-behavior',
···
1583
1587
'javelin-util',
1584
1588
'javelin-reactor-node-calmer',
1585
1589
),
1586
-
'7353f43d' => array(
1587
-
'javelin-behavior',
1588
-
'javelin-stratcom',
1589
-
'javelin-vector',
1590
-
'javelin-dom',
1591
-
'javelin-uri',
1592
-
),
1593
1590
'73ecc1f8' => array(
1594
1591
'javelin-behavior',
1595
1592
'javelin-behavior-device',
···
1656
1653
'javelin-stratcom',
1657
1654
'javelin-dom',
1658
1655
'javelin-vector',
1659
-
),
1660
-
'8337f4c7' => array(
1661
-
'javelin-dom',
1662
1656
),
1663
1657
83754533 => array(
1664
1658
'javelin-install',
···
1878
1872
'a5823e4d' => array(
1879
1873
'javelin-dom',
1880
1874
),
1881
-
'a61c2d11' => array(
1882
-
'javelin-behavior',
1883
-
'phabricator-keyboard-shortcut',
1884
-
'javelin-stratcom',
1885
-
),
1886
1875
'a9942052' => array(
1887
1876
'javelin-behavior',
1888
1877
'javelin-dom',
···
2046
2035
'c03f2fb4' => array(
2047
2036
'javelin-install',
2048
2037
),
2038
+
'c0ed32ce' => array(
2039
+
'javelin-dom',
2040
+
),
2049
2041
'c2c500a7' => array(
2050
2042
'javelin-install',
2051
2043
'javelin-dom',
···
2160
2152
'e9c80beb' => array(
2161
2153
'javelin-install',
2162
2154
'javelin-event',
2163
-
),
2164
-
'ea6e377d' => array(
2165
-
'javelin-dom',
2166
-
'javelin-util',
2167
-
'javelin-stratcom',
2168
-
'javelin-install',
2169
-
'javelin-workflow',
2170
-
'javelin-router',
2171
-
'javelin-behavior-device',
2172
-
'javelin-vector',
2173
-
'phabricator-diff-inline',
2174
-
'phabricator-diff-path-view',
2175
2155
),
2176
2156
'ebe83a6b' => array(
2177
2157
'javelin-install',
···
2187
2167
'javelin-dom',
2188
2168
'javelin-stratcom',
2189
2169
),
2190
-
'f166c949' => array(
2191
-
'javelin-behavior',
2192
-
'javelin-behavior-device',
2193
-
'javelin-stratcom',
2194
-
'javelin-dom',
2195
-
'javelin-magical-init',
2196
-
'javelin-vector',
2197
-
'javelin-request',
2198
-
'javelin-util',
2199
-
),
2200
2170
'f340a484' => array(
2201
2171
'javelin-install',
2202
2172
'javelin-dom',
···
2377
2347
'javelin-behavior-aphlict-dropdown',
2378
2348
'javelin-behavior-history-install',
2379
2349
'javelin-behavior-phabricator-gesture',
2380
-
'javelin-behavior-phabricator-active-nav',
2381
-
'javelin-behavior-phabricator-nav',
2382
2350
'javelin-behavior-phabricator-remarkup-assist',
2383
2351
'phabricator-textareautils',
2384
2352
'phabricator-file-upload',
···
2424
2392
'phabricator-content-source-view-css',
2425
2393
'inline-comment-summary-css',
2426
2394
'phui-inline-comment-view-css',
2427
-
'phabricator-filetree-view-css',
2428
2395
),
2429
2396
'differential.pkg.js' => array(
2430
2397
'phabricator-drag-and-drop-file-upload',
-3
resources/celerity/packages.php
-3
resources/celerity/packages.php
···
54
54
'javelin-behavior-aphlict-dropdown',
55
55
'javelin-behavior-history-install',
56
56
'javelin-behavior-phabricator-gesture',
57
-
'javelin-behavior-phabricator-active-nav',
58
-
'javelin-behavior-phabricator-nav',
59
57
'javelin-behavior-phabricator-remarkup-assist',
60
58
'phabricator-textareautils',
61
59
'phabricator-file-upload',
···
187
185
'phabricator-content-source-view-css',
188
186
'inline-comment-summary-css',
189
187
'phui-inline-comment-view-css',
190
-
'phabricator-filetree-view-css',
191
188
),
192
189
'differential.pkg.js' => array(
193
190
'phabricator-drag-and-drop-file-upload',
-4
src/__phutil_library_map__.php
-4
src/__phutil_library_map__.php
···
466
466
'DifferentialChangeset' => 'applications/differential/storage/DifferentialChangeset.php',
467
467
'DifferentialChangesetDetailView' => 'applications/differential/view/DifferentialChangesetDetailView.php',
468
468
'DifferentialChangesetEngine' => 'applications/differential/engine/DifferentialChangesetEngine.php',
469
-
'DifferentialChangesetFileTreeSideNavBuilder' => 'applications/differential/view/DifferentialChangesetFileTreeSideNavBuilder.php',
470
469
'DifferentialChangesetHTMLRenderer' => 'applications/differential/render/DifferentialChangesetHTMLRenderer.php',
471
470
'DifferentialChangesetListController' => 'applications/differential/controller/DifferentialChangesetListController.php',
472
471
'DifferentialChangesetListView' => 'applications/differential/view/DifferentialChangesetListView.php',
···
4769
4768
'PhabricatorSetupIssueView' => 'applications/config/view/PhabricatorSetupIssueView.php',
4770
4769
'PhabricatorShiftChartFunction' => 'applications/fact/chart/PhabricatorShiftChartFunction.php',
4771
4770
'PhabricatorShortSite' => 'aphront/site/PhabricatorShortSite.php',
4772
-
'PhabricatorShowFiletreeSetting' => 'applications/settings/setting/PhabricatorShowFiletreeSetting.php',
4773
4771
'PhabricatorSignDocumentsUserLogType' => 'applications/people/userlog/PhabricatorSignDocumentsUserLogType.php',
4774
4772
'PhabricatorSimpleEditType' => 'applications/transactions/edittype/PhabricatorSimpleEditType.php',
4775
4773
'PhabricatorSinChartFunction' => 'applications/fact/chart/PhabricatorSinChartFunction.php',
···
6517
6515
),
6518
6516
'DifferentialChangesetDetailView' => 'AphrontView',
6519
6517
'DifferentialChangesetEngine' => 'Phobject',
6520
-
'DifferentialChangesetFileTreeSideNavBuilder' => 'Phobject',
6521
6518
'DifferentialChangesetHTMLRenderer' => 'DifferentialChangesetRenderer',
6522
6519
'DifferentialChangesetListController' => 'DifferentialController',
6523
6520
'DifferentialChangesetListView' => 'AphrontView',
···
11519
11516
'PhabricatorSetupIssueView' => 'AphrontView',
11520
11517
'PhabricatorShiftChartFunction' => 'PhabricatorPureChartFunction',
11521
11518
'PhabricatorShortSite' => 'PhabricatorSite',
11522
-
'PhabricatorShowFiletreeSetting' => 'PhabricatorSelectSetting',
11523
11519
'PhabricatorSignDocumentsUserLogType' => 'PhabricatorUserLogType',
11524
11520
'PhabricatorSimpleEditType' => 'PhabricatorEditType',
11525
11521
'PhabricatorSinChartFunction' => 'PhabricatorPureChartFunction',
-1
src/applications/differential/view/DifferentialChangesetDetailView.php
-1
src/applications/differential/view/DifferentialChangesetDetailView.php
+15
-29
src/applications/diffusion/controller/DiffusionCommitController.php
+15
-29
src/applications/diffusion/controller/DiffusionCommitController.php
···
457
457
$commit,
458
458
$timeline);
459
459
460
-
$filetree_on = $viewer->compareUserSetting(
461
-
PhabricatorShowFiletreeSetting::SETTINGKEY,
462
-
PhabricatorShowFiletreeSetting::VALUE_ENABLE_FILETREE);
463
-
464
-
$nav = null;
465
-
if ($show_changesets && $filetree_on) {
466
-
$pref_collapse = PhabricatorFiletreeVisibleSetting::SETTINGKEY;
467
-
$collapsed = $viewer->getUserSetting($pref_collapse);
468
-
469
-
$pref_width = PhabricatorFiletreeWidthSetting::SETTINGKEY;
470
-
$width = $viewer->getUserSetting($pref_width);
471
-
472
-
$nav = id(new DifferentialChangesetFileTreeSideNavBuilder())
473
-
->setTitle($commit->getDisplayName())
474
-
->setBaseURI(new PhutilURI($commit->getURI()))
475
-
->build($changesets)
476
-
->setCrumbs($crumbs)
477
-
->setCollapsed((bool)$collapsed)
478
-
->setWidth((int)$width);
479
-
}
460
+
$filetree = id(new DifferentialFileTreeEngine())
461
+
->setViewer($viewer)
462
+
->setChangesets($changesets)
463
+
->setDisabled(!$show_changesets);
480
464
481
465
$description_box = id(new PHUIObjectBoxView())
482
466
->setHeaderText(pht('Description'))
···
509
493
$add_comment,
510
494
));
511
495
496
+
$main_content = array(
497
+
$crumbs,
498
+
$view,
499
+
);
500
+
501
+
$main_content = $filetree->newView($main_content);
502
+
if (!$filetree->getDisabled()) {
503
+
$change_list->setFormationView($main_content);
504
+
}
505
+
512
506
$page = $this->newPage()
513
507
->setTitle($commit->getDisplayName())
514
-
->setCrumbs($crumbs)
515
508
->setPageObjectPHIDS(array($commit->getPHID()))
516
-
->appendChild(
517
-
array(
518
-
$view,
519
-
));
520
-
521
-
if ($nav) {
522
-
$page->setNavigation($nav);
523
-
}
509
+
->appendChild($main_content);
524
510
525
511
return $page;
526
512
-42
src/applications/settings/setting/PhabricatorShowFiletreeSetting.php
-42
src/applications/settings/setting/PhabricatorShowFiletreeSetting.php
···
1
-
<?php
2
-
3
-
final class PhabricatorShowFiletreeSetting
4
-
extends PhabricatorSelectSetting {
5
-
6
-
const SETTINGKEY = 'diff-filetree';
7
-
8
-
const VALUE_DISABLE_FILETREE = 0;
9
-
const VALUE_ENABLE_FILETREE = 1;
10
-
11
-
public function getSettingName() {
12
-
return pht('Show Filetree');
13
-
}
14
-
15
-
protected function getSettingOrder() {
16
-
return 300;
17
-
}
18
-
19
-
public function getSettingPanelKey() {
20
-
return PhabricatorDiffPreferencesSettingsPanel::PANELKEY;
21
-
}
22
-
23
-
protected function getControlInstructions() {
24
-
return pht(
25
-
'When viewing a revision or commit, you can enable a sidebar showing '.
26
-
'affected files. When this option is enabled, press {nav %s} to show '.
27
-
'or hide the sidebar.',
28
-
'f');
29
-
}
30
-
31
-
public function getSettingDefaultValue() {
32
-
return self::VALUE_DISABLE_FILETREE;
33
-
}
34
-
35
-
protected function getSelectOptions() {
36
-
return array(
37
-
self::VALUE_DISABLE_FILETREE => pht('Disable Filetree'),
38
-
self::VALUE_ENABLE_FILETREE => pht('Enable Filetree'),
39
-
);
40
-
}
41
-
42
-
}
+6
-3
webroot/rsrc/css/application/base/standard-page-view.css
+6
-3
webroot/rsrc/css/application/base/standard-page-view.css
···
81
81
}
82
82
83
83
.keyboard-focus-focus-reticle {
84
-
background: rgba(255, 255, 211, 0.15);
85
84
position: absolute;
86
-
border: 1px solid {$yellow};
87
-
pointer-events: none;
85
+
86
+
box-sizing: border-box;
87
+
border-width: 0 6px 0 0;
88
+
border-style: solid;
89
+
border-color: {$yellow};
90
+
background: {$lightyellow};
88
91
}
89
92
90
93
a.handle-status-closed {
+31
-3
webroot/rsrc/css/application/diff/diff-tree-view.css
+31
-3
webroot/rsrc/css/application/diff/diff-tree-view.css
···
3
3
*/
4
4
5
5
.diff-tree-view {
6
-
margin: 4px;
6
+
margin: 0 4px;
7
7
}
8
8
9
9
.diff-tree-path {
10
-
position: relative;
11
10
height: 20px;
12
11
color: {$greytext};
13
12
line-height: 20px;
14
13
}
15
14
15
+
.diff-tree-path-indent {
16
+
position: relative;
17
+
}
18
+
16
19
.diff-tree-path-icon {
17
20
position: absolute;
18
21
width: 20px;
···
22
25
23
26
.diff-tree-path-name {
24
27
margin-left: 24px;
25
-
margin-right: 24px;
28
+
margin-right: 44px;
26
29
white-space: nowrap;
27
30
overflow: hidden;
28
31
text-overflow: ellipsis;
···
45
48
background: {$lightblueborder};
46
49
transition: 0.1s;
47
50
}
51
+
52
+
.diff-tree-path-inlines {
53
+
display: none;
54
+
position: absolute;
55
+
right: 4px;
56
+
border-radius: 4px;
57
+
text-align: center;
58
+
top: 2px;
59
+
height: 16px;
60
+
line-height: 14px;
61
+
width: 36px;
62
+
font-size: {$smallerfontsize};
63
+
color: {$greytext};
64
+
}
65
+
66
+
.diff-tree-path-inlines-visible {
67
+
display: block;
68
+
background: {$lightblueborder};
69
+
}
70
+
71
+
.diff-tree-path-inlines-completed {
72
+
background: {$darkgreybackground};
73
+
color: {$lightgreytext};
74
+
opacity: 0.75;
75
+
}
-4
webroot/rsrc/css/core/z-index.css
-4
webroot/rsrc/css/core/z-index.css
-91
webroot/rsrc/css/layout/phabricator-filetree-view.css
-91
webroot/rsrc/css/layout/phabricator-filetree-view.css
···
1
-
/**
2
-
* @provides phabricator-filetree-view-css
3
-
*/
4
-
5
-
.phabricator-filetree {
6
-
padding: 4px 0;
7
-
}
8
-
9
-
/* NOTE: Until the whole side nav situation gets cleaned up, we need to be
10
-
highly specific in specifying selectors here, to override side nav styles.
11
-
*/
12
-
13
-
.phabricator-filetree .phabricator-filetree-item {
14
-
margin: 0;
15
-
padding: 0;
16
-
display: block;
17
-
border-left: 4px solid transparent;
18
-
}
19
-
20
-
.phabricator-filetree span.phabricator-filetree-icon {
21
-
background-repeat: no-repeat;
22
-
background-position: 0 2px;
23
-
width: 16px;
24
-
height: 20px;
25
-
padding: 0;
26
-
float: left;
27
-
}
28
-
29
-
.phabricator-filetree span.phabricator-filetree-name {
30
-
padding: 0;
31
-
margin-left: 4px;
32
-
font-size: 12px;
33
-
font-weight: normal;
34
-
line-height: 20px;
35
-
white-space: nowrap;
36
-
}
37
-
38
-
.phabricator-filetree span.phabricator-filetree-item
39
-
.phabricator-filetree-name {
40
-
color: {$darkbluetext};
41
-
}
42
-
43
-
.phabricator-filetree a.phabricator-filetree-item
44
-
.phabricator-filetree-name {
45
-
color: {$darkbluetext};
46
-
}
47
-
48
-
.phabricator-filetree a.phabricator-filetree-item:hover {
49
-
text-decoration: none;
50
-
background-color: {$hovergrey};
51
-
}
52
-
53
-
.phabricator-filetree .filetree-added {
54
-
background: {$sh-greenbackground};
55
-
}
56
-
57
-
.phabricator-filetree .filetree-deleted {
58
-
background: {$sh-redbackground};
59
-
}
60
-
61
-
.phabricator-filetree .filetree-movecopy {
62
-
background: {$sh-orangebackground};
63
-
}
64
-
65
-
.phabricator-filetree .phabricator-active-nav-focus {
66
-
background-color: {$hovergrey};
67
-
border-left: 4px solid {$sky};
68
-
}
69
-
70
-
.phabricator-filetree .filetree-progress-hint {
71
-
width: 24px;
72
-
margin-right: 6px;
73
-
display: inline-block;
74
-
padding: 0 4px;
75
-
border-radius: 4px;
76
-
font-size: smaller;
77
-
background: {$greybackground};
78
-
text-align: center;
79
-
opacity: 0.5;
80
-
}
81
-
82
-
.phabricator-filetree .filetree-comments-visible {
83
-
background: {$lightblue};
84
-
opacity: 0.75;
85
-
color: {$darkgreytext};
86
-
}
87
-
88
-
.phabricator-filetree .filetree-comments-completed {
89
-
background: {$darkgreybackground};
90
-
color: {$greytext};
91
-
}
+6
-11
webroot/rsrc/js/application/diff/DiffChangeset.js
+6
-11
webroot/rsrc/js/application/diff/DiffChangeset.js
···
67
67
68
68
_changesetList: null,
69
69
_icon: null,
70
-
_treeNodeID: null,
71
70
72
71
_editorURI: null,
73
72
_editorConfigureURI: null,
···
770
769
},
771
770
772
771
redrawFileTree: function() {
773
-
var tree;
774
-
try {
775
-
tree = JX.$(this._treeNodeID);
776
-
} catch (e) {
777
-
return;
778
-
}
779
-
780
772
var inlines = this._inlines;
781
773
var done = [];
782
774
var undone = [];
···
833
825
is_completed = false;
834
826
}
835
827
836
-
JX.DOM.setContent(tree, hint);
837
-
JX.DOM.alterClass(tree, 'filetree-comments-visible', is_visible);
838
-
JX.DOM.alterClass(tree, 'filetree-comments-completed', is_completed);
828
+
var node = this.getPathView().getInlineNode();
829
+
830
+
JX.DOM.setContent(node, hint);
831
+
832
+
JX.DOM.alterClass(node, 'diff-tree-path-inlines-visible', is_visible);
833
+
JX.DOM.alterClass(node, 'diff-tree-path-inlines-completed', is_completed);
839
834
},
840
835
841
836
toggleVisibility: function() {
+4
-3
webroot/rsrc/js/application/diff/DiffChangesetList.js
+4
-3
webroot/rsrc/js/application/diff/DiffChangesetList.js
···
1177
1177
// space between the focused element and the outline.
1178
1178
var p = JX.Vector.getPos(node);
1179
1179
var s = JX.Vector.getAggregateScrollForNode(node);
1180
+
var d = JX.Vector.getDim(node);
1180
1181
1181
-
p.add(s).add(-4, -4).setPos(reticle);
1182
+
p.add(s).add(d.x + 1, 0).setPos(reticle);
1182
1183
// Compute the size we need to extend to the full extent of the focused
1183
1184
// nodes.
1184
1185
JX.Vector.getPos(extended_node)
1185
1186
.add(-p.x, -p.y)
1186
-
.add(JX.Vector.getDim(extended_node))
1187
-
.add(8, 8)
1187
+
.add(0, JX.Vector.getDim(extended_node).y)
1188
+
.add(10, 0)
1188
1189
.setDim(reticle);
1189
1190
1190
1191
JX.DOM.getContentFrame().appendChild(reticle);
+18
-2
webroot/rsrc/js/application/diff/DiffPathView.js
+18
-2
webroot/rsrc/js/application/diff/DiffPathView.js
···
20
20
_indentNode: null,
21
21
_pathNode: null,
22
22
_changeset: null,
23
+
_inlineNode: null,
23
24
24
25
getNode: function() {
25
26
if (!this._node) {
···
71
72
setDepth: function(depth) {
72
73
this._depth = depth;
73
74
74
-
this._getIndentNode().style.marginLeft = (8 * this._depth) + 'px';
75
+
this._getIndentNode().style.marginLeft = (6 * this._depth) + 'px';
75
76
76
77
return this;
77
78
},
···
109
110
110
111
_getIndentNode: function() {
111
112
if (!this._indentNode) {
113
+
var attrs = {
114
+
className: 'diff-tree-path-indent'
115
+
};
116
+
112
117
var content = [
118
+
this.getInlineNode(),
113
119
this._getIconNode(),
114
120
this._getPathNode(),
115
121
];
116
122
117
-
this._indentNode = JX.$N('div', {}, content);
123
+
this._indentNode = JX.$N('div', attrs, content);
118
124
}
119
125
120
126
return this._indentNode;
···
138
144
this._iconNode = JX.$N('div', attrs, this.getIcon().getNode());
139
145
}
140
146
return this._iconNode;
147
+
},
148
+
149
+
getInlineNode: function() {
150
+
if (!this._inlineNode) {
151
+
var attrs = {
152
+
className: 'diff-tree-path-inlines',
153
+
};
154
+
this._inlineNode = JX.$N('div', attrs, '-');
155
+
}
156
+
return this._inlineNode;
141
157
}
142
158
143
159
}
-17
webroot/rsrc/js/core/behavior-file-tree.js
-17
webroot/rsrc/js/core/behavior-file-tree.js
···
1
-
/**
2
-
* @provides javelin-behavior-phabricator-file-tree
3
-
* @requires javelin-behavior
4
-
* phabricator-keyboard-shortcut
5
-
* javelin-stratcom
6
-
*/
7
-
8
-
JX.behavior('phabricator-file-tree', function() {
9
-
10
-
new JX.KeyboardShortcut('f', 'Toggle file tree.')
11
-
.setGroup('diff-vis')
12
-
.setHandler(function() {
13
-
JX.Stratcom.invoke('differential-filetree-toggle');
14
-
})
15
-
.register();
16
-
17
-
});