@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
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Show "objectives" UI only if prototypes are enabled

Summary: See D17955.

Test Plan: Loaded a revision, no longer saw annotations with prototypes off. Still saw annotations with prototypes on.

Reviewers: chad

Reviewed By: chad

Differential Revision: https://secure.phabricator.com/D17983

+32 -19
+17 -17
resources/celerity/map.php
··· 13 13 'core.pkg.js' => 'e822b496', 14 14 'darkconsole.pkg.js' => '1f9a31bc', 15 15 'differential.pkg.css' => '4d7dd14e', 16 - 'differential.pkg.js' => '6d05ad4c', 16 + 'differential.pkg.js' => '0dfe037d', 17 17 'diffusion.pkg.css' => 'b93d9b8c', 18 18 'diffusion.pkg.js' => '84c8f8fd', 19 19 'favicon.ico' => '30672e08', ··· 391 391 'rsrc/js/application/dashboard/behavior-dashboard-query-panel-select.js' => '453c5375', 392 392 'rsrc/js/application/dashboard/behavior-dashboard-tab-panel.js' => 'd4eecc63', 393 393 'rsrc/js/application/diff/DiffChangeset.js' => 'cf4e2140', 394 - 'rsrc/js/application/diff/DiffChangesetList.js' => '541206ba', 394 + 'rsrc/js/application/diff/DiffChangesetList.js' => 'a716ca27', 395 395 'rsrc/js/application/diff/DiffInline.js' => '77e14b60', 396 396 'rsrc/js/application/diff/ScrollObjective.js' => '0eee7a00', 397 397 'rsrc/js/application/diff/ScrollObjectiveList.js' => '1ca4d9db', 398 398 'rsrc/js/application/diff/behavior-preview-link.js' => '051c7832', 399 399 'rsrc/js/application/differential/behavior-comment-preview.js' => '51c5ad07', 400 400 'rsrc/js/application/differential/behavior-diff-radios.js' => 'e1ff79b1', 401 - 'rsrc/js/application/differential/behavior-populate.js' => '5e41c819', 401 + 'rsrc/js/application/differential/behavior-populate.js' => '1de8bf63', 402 402 'rsrc/js/application/differential/behavior-user-select.js' => 'a8d8459d', 403 403 'rsrc/js/application/diffusion/DiffusionLocateFileSource.js' => 'c93358e3', 404 404 'rsrc/js/application/diffusion/behavior-audit-preview.js' => 'd835b03a', ··· 620 620 'javelin-behavior-diff-preview-link' => '051c7832', 621 621 'javelin-behavior-differential-diff-radios' => 'e1ff79b1', 622 622 'javelin-behavior-differential-feedback-preview' => '51c5ad07', 623 - 'javelin-behavior-differential-populate' => '5e41c819', 623 + 'javelin-behavior-differential-populate' => '1de8bf63', 624 624 'javelin-behavior-differential-user-select' => 'a8d8459d', 625 625 'javelin-behavior-diffusion-browse-file' => '054a0f0b', 626 626 'javelin-behavior-diffusion-commit-branches' => 'bdaf4d04', ··· 778 778 'phabricator-darkmessage' => 'c48cccdd', 779 779 'phabricator-dashboard-css' => 'fe5b1869', 780 780 'phabricator-diff-changeset' => 'cf4e2140', 781 - 'phabricator-diff-changeset-list' => '541206ba', 781 + 'phabricator-diff-changeset-list' => 'a716ca27', 782 782 'phabricator-diff-inline' => '77e14b60', 783 783 'phabricator-drag-and-drop-file-upload' => '58dea2fa', 784 784 'phabricator-draggable-list' => 'bea6e7f4', ··· 1042 1042 'javelin-workflow', 1043 1043 'phabricator-scroll-objective', 1044 1044 ), 1045 + '1de8bf63' => array( 1046 + 'javelin-behavior', 1047 + 'javelin-dom', 1048 + 'javelin-stratcom', 1049 + 'phabricator-tooltip', 1050 + 'phabricator-diff-changeset-list', 1051 + 'phabricator-diff-changeset', 1052 + ), 1045 1053 '1def2711' => array( 1046 1054 'javelin-install', 1047 1055 'javelin-dom', ··· 1316 1324 '5294060f' => array( 1317 1325 'phui-theme-css', 1318 1326 ), 1319 - '541206ba' => array( 1320 - 'javelin-install', 1321 - 'phabricator-scroll-objective-list', 1322 - ), 1323 1327 '54774a28' => array( 1324 1328 'phui-inline-comment-view-css', 1325 1329 ), ··· 1377 1381 'javelin-aphlict', 1378 1382 'phabricator-phtize', 1379 1383 'javelin-dom', 1380 - ), 1381 - '5e41c819' => array( 1382 - 'javelin-behavior', 1383 - 'javelin-dom', 1384 - 'javelin-stratcom', 1385 - 'phabricator-tooltip', 1386 - 'phabricator-diff-changeset-list', 1387 - 'phabricator-diff-changeset', 1388 1384 ), 1389 1385 '5e9f347c' => array( 1390 1386 'javelin-behavior', ··· 1729 1725 'javelin-behavior', 1730 1726 'javelin-stratcom', 1731 1727 'javelin-dom', 1728 + ), 1729 + 'a716ca27' => array( 1730 + 'javelin-install', 1731 + 'phabricator-scroll-objective-list', 1732 1732 ), 1733 1733 'a80d0378' => array( 1734 1734 'javelin-behavior',
+4
src/applications/differential/view/DifferentialChangesetListView.php
··· 203 203 204 204 $this->requireResource('aphront-tooltip-css'); 205 205 206 + $show_objectives = 207 + PhabricatorEnv::getEnvConfig('phabricator.show-prototypes'); 208 + 206 209 $this->initBehavior( 207 210 'differential-populate', 208 211 array( 209 212 'changesetViewIDs' => $ids, 210 213 'inlineURI' => $this->inlineURI, 214 + 'showObjectives' => $show_objectives, 211 215 'pht' => array( 212 216 'Open in Editor' => pht('Open in Editor'), 213 217 'Show All Context' => pht('Show All Context'),
+9 -1
webroot/rsrc/js/application/diff/DiffChangesetList.js
··· 120 120 _rangeTarget: null, 121 121 122 122 _bannerNode: null, 123 + _showObjectives: false, 123 124 124 125 sleep: function() { 125 126 this._asleep = true; ··· 137 138 this._redrawFocus(); 138 139 this._redrawSelection(); 139 140 140 - this._objectives.show(); 141 + if (this._showObjectives) { 142 + this._objectives.show(); 143 + } 141 144 142 145 if (this._initialized) { 143 146 return; ··· 193 196 194 197 label = pht('Hide or show inline comment.'); 195 198 this._installKey('q', label, this._onkeyhide); 199 + }, 200 + 201 + setShowObjectives: function(show) { 202 + this._showObjectives = show; 203 + return this; 196 204 }, 197 205 198 206 isAsleep: function() {
+2 -1
webroot/rsrc/js/application/differential/behavior-populate.js
··· 60 60 61 61 var changeset_list = new JX.DiffChangesetList() 62 62 .setTranslations(JX.phtize(config.pht)) 63 - .setInlineURI(config.inlineURI); 63 + .setInlineURI(config.inlineURI) 64 + .setShowObjectives(config.showObjectives); 64 65 65 66 // Install and activate the current page. 66 67 var page_id = JX.Quicksand.getCurrentPageID();