From 19c840edf28cfdff852cbaf4f3d67fc0a7f3f3af Mon Sep 17 00:00:00 2001 From: vrana Date: Tue, 6 Nov 2012 11:45:10 -0800 Subject: [PATCH] Better explain 'h' keyboard shortcut in Differential Summary: Also move 'f' outside this group of commands. Test Plan: Pressed '?'. Reviewers: epriestley, alanh, frantic Reviewed By: epriestley CC: aran, Korvin Differential Revision: https://secure.phabricator.com/D3903 --- src/__celerity_resource_map__.php | 40 +++++++++---------- .../differential/behavior-keyboard-nav.js | 16 ++++---- 2 files changed, 29 insertions(+), 27 deletions(-) diff --git a/src/__celerity_resource_map__.php b/src/__celerity_resource_map__.php index 5334d48abd..60ff514054 100644 --- a/src/__celerity_resource_map__.php +++ b/src/__celerity_resource_map__.php @@ -1181,7 +1181,7 @@ celerity_register_resource_map(array( ), 'javelin-behavior-differential-keyboard-navigation' => array( - 'uri' => '/res/0a013420/rsrc/js/application/differential/behavior-keyboard-nav.js', + 'uri' => '/res/a7798465/rsrc/js/application/differential/behavior-keyboard-nav.js', 'type' => 'js', 'requires' => array( @@ -3172,7 +3172,7 @@ celerity_register_resource_map(array( 'uri' => '/res/pkg/7d861806/differential.pkg.css', 'type' => 'css', ), - 58152763 => + 'cab76945' => array( 'name' => 'differential.pkg.js', 'symbols' => @@ -3195,7 +3195,7 @@ celerity_register_resource_map(array( 15 => 'differential-inline-comment-editor', 16 => 'javelin-behavior-differential-dropdown-menus', ), - 'uri' => '/res/pkg/58152763/differential.pkg.js', + 'uri' => '/res/pkg/cab76945/differential.pkg.js', 'type' => 'js', ), 'c8ce2d88' => @@ -3303,7 +3303,7 @@ celerity_register_resource_map(array( 'aphront-typeahead-control-css' => '10a01616', 'differential-changeset-view-css' => '7d861806', 'differential-core-view-css' => '7d861806', - 'differential-inline-comment-editor' => '58152763', + 'differential-inline-comment-editor' => 'cab76945', 'differential-local-commits-view-css' => '7d861806', 'differential-results-table-css' => '7d861806', 'differential-revision-add-comment-css' => '7d861806', @@ -3317,20 +3317,20 @@ celerity_register_resource_map(array( 'inline-comment-summary-css' => '7d861806', 'javelin-behavior' => 'c50bbf3a', 'javelin-behavior-aphront-basic-tokenizer' => 'dd024ca1', - 'javelin-behavior-aphront-drag-and-drop' => '58152763', - 'javelin-behavior-aphront-drag-and-drop-textarea' => '58152763', + 'javelin-behavior-aphront-drag-and-drop' => 'cab76945', + 'javelin-behavior-aphront-drag-and-drop-textarea' => 'cab76945', 'javelin-behavior-aphront-form-disable-on-submit' => '805a58d7', 'javelin-behavior-audit-preview' => '5e68be89', - 'javelin-behavior-differential-accept-with-errors' => '58152763', - 'javelin-behavior-differential-add-reviewers-and-ccs' => '58152763', - 'javelin-behavior-differential-comment-jump' => '58152763', - 'javelin-behavior-differential-diff-radios' => '58152763', - 'javelin-behavior-differential-dropdown-menus' => '58152763', - 'javelin-behavior-differential-edit-inline-comments' => '58152763', - 'javelin-behavior-differential-feedback-preview' => '58152763', - 'javelin-behavior-differential-keyboard-navigation' => '58152763', - 'javelin-behavior-differential-populate' => '58152763', - 'javelin-behavior-differential-show-more' => '58152763', + 'javelin-behavior-differential-accept-with-errors' => 'cab76945', + 'javelin-behavior-differential-add-reviewers-and-ccs' => 'cab76945', + 'javelin-behavior-differential-comment-jump' => 'cab76945', + 'javelin-behavior-differential-diff-radios' => 'cab76945', + 'javelin-behavior-differential-dropdown-menus' => 'cab76945', + 'javelin-behavior-differential-edit-inline-comments' => 'cab76945', + 'javelin-behavior-differential-feedback-preview' => 'cab76945', + 'javelin-behavior-differential-keyboard-navigation' => 'cab76945', + 'javelin-behavior-differential-populate' => 'cab76945', + 'javelin-behavior-differential-show-more' => 'cab76945', 'javelin-behavior-diffusion-commit-graph' => '5e68be89', 'javelin-behavior-diffusion-pull-lastmodified' => '5e68be89', 'javelin-behavior-maniphest-batch-selector' => '7707de41', @@ -3340,12 +3340,12 @@ celerity_register_resource_map(array( 'javelin-behavior-maniphest-transaction-preview' => '7707de41', 'javelin-behavior-phabricator-autofocus' => '805a58d7', 'javelin-behavior-phabricator-keyboard-shortcuts' => '805a58d7', - 'javelin-behavior-phabricator-object-selector' => '58152763', + 'javelin-behavior-phabricator-object-selector' => 'cab76945', 'javelin-behavior-phabricator-oncopy' => '805a58d7', 'javelin-behavior-phabricator-tooltips' => '805a58d7', 'javelin-behavior-phabricator-watch-anchor' => '805a58d7', 'javelin-behavior-refresh-csrf' => '805a58d7', - 'javelin-behavior-repository-crossreference' => '58152763', + 'javelin-behavior-repository-crossreference' => 'cab76945', 'javelin-behavior-workflow' => '805a58d7', 'javelin-dom' => 'c50bbf3a', 'javelin-event' => 'c50bbf3a', @@ -3371,7 +3371,7 @@ celerity_register_resource_map(array( 'phabricator-core-buttons-css' => '10a01616', 'phabricator-core-css' => '10a01616', 'phabricator-directory-css' => '10a01616', - 'phabricator-drag-and-drop-file-upload' => '58152763', + 'phabricator-drag-and-drop-file-upload' => 'cab76945', 'phabricator-dropdown-menu' => '805a58d7', 'phabricator-flag-css' => '10a01616', 'phabricator-jump-nav' => '10a01616', @@ -3383,7 +3383,7 @@ celerity_register_resource_map(array( 'phabricator-prefab' => '805a58d7', 'phabricator-project-tag-css' => '7839ae2d', 'phabricator-remarkup-css' => '10a01616', - 'phabricator-shaped-request' => '58152763', + 'phabricator-shaped-request' => 'cab76945', 'phabricator-standard-page-view' => '10a01616', 'phabricator-tooltip' => '805a58d7', 'phabricator-transaction-view-css' => '10a01616', diff --git a/webroot/rsrc/js/application/differential/behavior-keyboard-nav.js b/webroot/rsrc/js/application/differential/behavior-keyboard-nav.js index d152deac87..46695a43a8 100644 --- a/webroot/rsrc/js/application/differential/behavior-keyboard-nav.js +++ b/webroot/rsrc/js/application/differential/behavior-keyboard-nav.js @@ -224,13 +224,9 @@ JX.behavior('differential-keyboard-navigation', function(config) { }) .register(); - new JX.KeyboardShortcut('f', 'Toggle file tree.') - .setHandler(function(manager) { - JX.Stratcom.invoke('differential-filetree-toggle'); - }) - .register(); - - new JX.KeyboardShortcut('h', 'Collapse or expand the file display.') + new JX.KeyboardShortcut( + 'h', + 'Collapse or expand the file display (after jump).') .setHandler(function(manager) { if (!changesets || !changesets[cursor]) { return; @@ -268,6 +264,12 @@ JX.behavior('differential-keyboard-navigation', function(config) { }) .register(); + new JX.KeyboardShortcut('f', 'Toggle file tree.') + .setHandler(function(manager) { + JX.Stratcom.invoke('differential-filetree-toggle'); + }) + .register(); + if (config.haunt) { new JX.KeyboardShortcut('z', 'Cycle comment panel haunting modes.') .setHandler(haunt)