From cec779cdabeece5f4a93d746939062ba1f34a577 Mon Sep 17 00:00:00 2001 From: epriestley Date: Thu, 28 Mar 2019 17:49:00 -0700 Subject: [PATCH] When drawing a very wide graph line diagram, smush it together a bit Summary: Depends on D20345. Use a narrower layout for very large graphs to save some space. Test Plan: Before: {F6320215} After: {F6320216} This does not affect smaller graphs. Reviewers: amckinley Reviewed By: amckinley Differential Revision: https://secure.phabricator.com/D20346 --- resources/celerity/map.php | 16 ++++++++-------- .../diffusion/behavior-commit-graph.js | 10 +++++++++- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/resources/celerity/map.php b/resources/celerity/map.php index 4912f91b08..1f36bf03b4 100644 --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -14,7 +14,7 @@ return array( 'differential.pkg.css' => '8d8360fb', 'differential.pkg.js' => '67e02996', 'diffusion.pkg.css' => '42c75c37', - 'diffusion.pkg.js' => '91192d85', + 'diffusion.pkg.js' => 'a98c0bf7', 'maniphest.pkg.css' => '35995d6d', 'maniphest.pkg.js' => 'c9308721', 'rsrc/audio/basic/alert.mp3' => '17889334', @@ -384,7 +384,7 @@ return array( 'rsrc/js/application/diffusion/DiffusionLocateFileSource.js' => '94243d89', 'rsrc/js/application/diffusion/behavior-audit-preview.js' => 'b7b73831', 'rsrc/js/application/diffusion/behavior-commit-branches.js' => '4b671572', - 'rsrc/js/application/diffusion/behavior-commit-graph.js' => '1c88f154', + 'rsrc/js/application/diffusion/behavior-commit-graph.js' => 'ef836bf2', 'rsrc/js/application/diffusion/behavior-locate-file.js' => '87428eb2', 'rsrc/js/application/diffusion/behavior-pull-lastmodified.js' => 'c715c123', 'rsrc/js/application/doorkeeper/behavior-doorkeeper-tag.js' => '6a85bc5a', @@ -606,7 +606,7 @@ return array( 'javelin-behavior-differential-diff-radios' => '925fe8cd', 'javelin-behavior-differential-populate' => 'dfa1d313', 'javelin-behavior-diffusion-commit-branches' => '4b671572', - 'javelin-behavior-diffusion-commit-graph' => '1c88f154', + 'javelin-behavior-diffusion-commit-graph' => 'ef836bf2', 'javelin-behavior-diffusion-locate-file' => '87428eb2', 'javelin-behavior-diffusion-pull-lastmodified' => 'c715c123', 'javelin-behavior-document-engine' => '243d6c22', @@ -1033,11 +1033,6 @@ return array( 'javelin-install', 'javelin-util', ), - '1c88f154' => array( - 'javelin-behavior', - 'javelin-dom', - 'javelin-stratcom', - ), '1cab0e9a' => array( 'javelin-behavior', 'javelin-dom', @@ -2124,6 +2119,11 @@ return array( 'phabricator-keyboard-shortcut', 'javelin-stratcom', ), + 'ef836bf2' => array( + 'javelin-behavior', + 'javelin-dom', + 'javelin-stratcom', + ), 'f166c949' => array( 'javelin-behavior', 'javelin-behavior-device', diff --git a/webroot/rsrc/js/application/diffusion/behavior-commit-graph.js b/webroot/rsrc/js/application/diffusion/behavior-commit-graph.js index 309f972324..5c4591b542 100644 --- a/webroot/rsrc/js/application/diffusion/behavior-commit-graph.js +++ b/webroot/rsrc/js/application/diffusion/behavior-commit-graph.js @@ -44,11 +44,19 @@ JX.behavior('diffusion-commit-graph', function(config) { cxt.stroke(); } + // If the graph is going to be wide, squish it a bit so it doesn't take up + // quite as much space. + var default_width; + if (config.count >= 8) { + default_width = 6; + } else { + default_width = 12; + } for (var ii = 0; ii < nodes.length; ii++) { var data = JX.Stratcom.getData(nodes[ii]); - var cell = 12; // Width of each thread. + var cell = default_width; var xpos = function(col) { return (col * cell) + (cell / 2); };