Merge branch 'master' into patch-1

storybookjs · Apr 7, 2018 · d2356ab · d2356ab
2 parents f170854 + 4e5038f
commit d2356ab
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/ui/src/libs/key_events.js b/lib/ui/src/libs/key_events.js
@@ -41,7 +41,7 @@ export default function handle(e) {
  case keycode('F'):
  e.preventDefault();
  return features.FULLSCREEN;
- case keycode('C'):
+ case keycode('Z'):
  // backward-compatibility
  case keycode('D'):
  e.preventDefault();

diff --git a/lib/ui/src/modules/ui/components/shortcuts_help.js b/lib/ui/src/modules/ui/components/shortcuts_help.js
@@ -43,7 +43,7 @@ export function getShortcuts(platform) {
  { name: 'Toggle Addon panel position', keys: ['⌘ ⇧ G', '⌃ ⇧ G'] },
  { name: 'Toggle Fullscreen Mode', keys: ['⌘ ⇧ F', '⌃ ⇧ F'] },
  { name: 'Toggle Stories Panel', keys: ['⌘ ⇧ X', '⌃ ⇧ X'] },
- { name: 'Toggle Addon panel', keys: ['⌘ ⇧ C', '⌃ ⇧ C'] },
+ { name: 'Toggle Addon panel', keys: ['⌘ ⇧ Z', '⌃ ⇧ Z'] },
  { name: 'Next Story', keys: ['⌘ ⇧ →', '⌃ ⇧ →'] },
  { name: 'Previous Story', keys: ['⌘ ⇧ ←', '⌃ ⇧ ←'] },
  ];
@@ -54,7 +54,7 @@ export function getShortcuts(platform) {
  { name: 'Toggle Addon panel position', keys: ['Ctrl + Shift + G'] },
  { name: 'Toggle Fullscreen Mode', keys: ['Ctrl + Shift + F'] },
  { name: 'Toggle Stories Panel', keys: ['Ctrl + Shift + X'] },
- { name: 'Toggle Addon panel', keys: ['Ctrl + Shift + C'] },
+ { name: 'Toggle Addon panel', keys: ['Ctrl + Shift + Z'] },
  { name: 'Next Story', keys: ['Ctrl + Shift + →'] },
  { name: 'Previous Story', keys: ['Ctrl + Shift + ←'] },
  ];