recaptime.dev / phorge
@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.

Merge behavior-show-more into behavior-populate

Summary: Ref T2009. It doesn't make sense to have these as separate behaviors. We require a ChangesetViewManager to track view parameter state.

Test Plan: Interacted with changesets in Phriction, Differential and Diffusion.

Reviewers: btrahan

Reviewed By: btrahan

Subscribers: epriestley

Maniphest Tasks: T2009

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

epriestley aa98d9e5 ad3c94dd

+24 -52
+10 -21
resources/celerity/map.php
··· 11 11 'core.pkg.js' => 'a77025a1', 12 12 'darkconsole.pkg.js' => '8ab24e01', 13 13 'differential.pkg.css' => 'd8866ed8', 14 - 'differential.pkg.js' => '9e55f9f5', 14 + 'differential.pkg.js' => '4db30ad2', 15 15 'diffusion.pkg.css' => '591664fa', 16 16 'diffusion.pkg.js' => 'bfc0737b', 17 17 'maniphest.pkg.css' => '68d4dd3d', ··· 369 369 'rsrc/js/application/differential/behavior-dropdown-menus.js' => '2035b9cb', 370 370 'rsrc/js/application/differential/behavior-edit-inline-comments.js' => '65936067', 371 371 'rsrc/js/application/differential/behavior-keyboard-nav.js' => '2c426492', 372 - 'rsrc/js/application/differential/behavior-populate.js' => 'bdb3e4d0', 372 + 'rsrc/js/application/differential/behavior-populate.js' => '8694b1df', 373 373 'rsrc/js/application/differential/behavior-show-field-details.js' => 'bba9eedf', 374 - 'rsrc/js/application/differential/behavior-show-more.js' => 'c662904a', 375 374 'rsrc/js/application/differential/behavior-toggle-files.js' => 'ca3f91eb', 376 375 'rsrc/js/application/differential/behavior-user-select.js' => 'a8d8459d', 377 376 'rsrc/js/application/diffusion/DiffusionLocateFileSource.js' => 'b42eddc7', ··· 573 572 'javelin-behavior-differential-edit-inline-comments' => '65936067', 574 573 'javelin-behavior-differential-feedback-preview' => '6932def3', 575 574 'javelin-behavior-differential-keyboard-navigation' => '2c426492', 576 - 'javelin-behavior-differential-populate' => 'bdb3e4d0', 575 + 'javelin-behavior-differential-populate' => '8694b1df', 577 576 'javelin-behavior-differential-show-field-details' => 'bba9eedf', 578 - 'javelin-behavior-differential-show-more' => 'c662904a', 579 577 'javelin-behavior-differential-toggle-files' => 'ca3f91eb', 580 578 'javelin-behavior-differential-user-select' => 'a8d8459d', 581 579 'javelin-behavior-diffusion-commit-branches' => 'bdaf4d04', ··· 1448 1446 '85ea0626' => array( 1449 1447 'javelin-install', 1450 1448 ), 1449 + '8694b1df' => array( 1450 + 'javelin-behavior', 1451 + 'javelin-dom', 1452 + 'javelin-stratcom', 1453 + 'phabricator-tooltip', 1454 + 'changeset-view-manager', 1455 + ), 1451 1456 '869e3445' => array( 1452 1457 'javelin-behavior', 1453 1458 'javelin-dom', ··· 1704 1709 'javelin-util', 1705 1710 'javelin-request', 1706 1711 ), 1707 - 'bdb3e4d0' => array( 1708 - 'javelin-behavior', 1709 - 'javelin-dom', 1710 - 'javelin-stratcom', 1711 - 'phabricator-tooltip', 1712 - 'changeset-view-manager', 1713 - ), 1714 1712 'be807912' => array( 1715 1713 'javelin-behavior', 1716 1714 'javelin-dom', ··· 1730 1728 'javelin-dom', 1731 1729 'javelin-stratcom', 1732 1730 'javelin-vector', 1733 - ), 1734 - 'c662904a' => array( 1735 - 'javelin-behavior', 1736 - 'javelin-dom', 1737 - 'javelin-workflow', 1738 - 'javelin-util', 1739 - 'javelin-stratcom', 1740 - 'changeset-view-manager', 1741 1731 ), 1742 1732 'c90a04fc' => array( 1743 1733 'javelin-dom', ··· 2160 2150 'javelin-behavior-differential-feedback-preview', 2161 2151 'javelin-behavior-differential-edit-inline-comments', 2162 2152 'javelin-behavior-differential-populate', 2163 - 'javelin-behavior-differential-show-more', 2164 2153 'javelin-behavior-differential-diff-radios', 2165 2154 'javelin-behavior-differential-comment-jump', 2166 2155 'javelin-behavior-differential-add-reviewers-and-ccs',
-1
resources/celerity/packages.php
··· 156 156 'javelin-behavior-differential-feedback-preview', 157 157 'javelin-behavior-differential-edit-inline-comments', 158 158 'javelin-behavior-differential-populate', 159 - 'javelin-behavior-differential-show-more', 160 159 'javelin-behavior-differential-diff-radios', 161 160 'javelin-behavior-differential-comment-jump', 162 161 'javelin-behavior-differential-add-reviewers-and-ccs',
-1
src/applications/differential/controller/DifferentialChangesetViewController.php
··· 240 240 'changesetViewIDs' => array($detail->getID()), 241 241 )); 242 242 243 - Javelin::initBehavior('differential-show-more'); 244 243 Javelin::initBehavior('differential-comment-jump', array()); 245 244 246 245 $panel = new DifferentialPrimaryPaneView();
-1
src/applications/differential/view/DifferentialChangesetListView.php
··· 209 209 'changesetViewIDs' => $ids, 210 210 )); 211 211 212 - $this->initBehavior('differential-show-more'); 213 212 $this->initBehavior('differential-comment-jump', array()); 214 213 215 214 if ($this->inlineURI) {
-1
src/applications/phriction/controller/PhrictionDiffController.php
··· 108 108 Javelin::initBehavior('differential-populate', array( 109 109 'changesetViewIDs' => array($output->getID()), 110 110 )); 111 - Javelin::initBehavior('differential-show-more'); 112 111 113 112 $slug = $document->getSlug(); 114 113
+14
webroot/rsrc/js/application/differential/behavior-populate.js
··· 36 36 } 37 37 }); 38 38 39 + JX.Stratcom.listen( 40 + 'click', 41 + 'show-more', 42 + function(e) { 43 + e.kill(); 44 + 45 + var changeset = e.getNode('differential-changeset'); 46 + var view = JX.ChangesetViewManager.getForNode(changeset); 47 + var data = e.getNodeData('show-more'); 48 + var target = e.getNode('context-target'); 49 + 50 + view.loadContext(data.range, target); 51 + }); 52 + 39 53 var highlighted = null; 40 54 var highlight_class = null; 41 55
-27
webroot/rsrc/js/application/differential/behavior-show-more.js
··· 1 - /** 2 - * @provides javelin-behavior-differential-show-more 3 - * @requires javelin-behavior 4 - * javelin-dom 5 - * javelin-workflow 6 - * javelin-util 7 - * javelin-stratcom 8 - * changeset-view-manager 9 - */ 10 - 11 - JX.behavior('differential-show-more', function() { 12 - 13 - JX.Stratcom.listen( 14 - 'click', 15 - 'show-more', 16 - function(e) { 17 - e.kill(); 18 - 19 - var changeset = e.getNode('differential-changeset'); 20 - var view = JX.ChangesetViewManager.getForNode(changeset); 21 - var data = e.getNodeData('show-more'); 22 - var target = e.getNode('context-target'); 23 - 24 - view.loadContext(data.range, target); 25 - }); 26 - 27 - });