| Index: Source/devtools/front_end/components/ShortcutsScreen.js
|
| diff --git a/Source/devtools/front_end/components/ShortcutsScreen.js b/Source/devtools/front_end/components/ShortcutsScreen.js
|
| index 51f42c88e63bff621f1a1c5dc72d5b118b81a724..186529fedb3d2d40580b217e7c088a62f3908870 100644
|
| --- a/Source/devtools/front_end/components/ShortcutsScreen.js
|
| +++ b/Source/devtools/front_end/components/ShortcutsScreen.js
|
| @@ -245,12 +245,12 @@ WebInspector.ShortcutsScreen.registerShortcuts = function()
|
| // Debugger
|
| var section = WebInspector.shortcutsScreen.section(WebInspector.UIString("Debugger"));
|
|
|
| - section.addAlternateKeys(WebInspector.shortcutRegistry.shortcutDescriptorsForAction("debugger.toggle-pause"), WebInspector.UIString("Pause/Continue"));
|
| - section.addAlternateKeys(WebInspector.ShortcutsScreen.SourcesPanelShortcuts.StepOver, WebInspector.UIString("Step over"));
|
| - section.addAlternateKeys(WebInspector.ShortcutsScreen.SourcesPanelShortcuts.StepInto, WebInspector.UIString("Step into"));
|
| - section.addAlternateKeys(WebInspector.ShortcutsScreen.SourcesPanelShortcuts.StepOut, WebInspector.UIString("Step out"));
|
| + section.addAlternateKeys(WebInspector.shortcutRegistry.shortcutDescriptorsForAction("debugger.toggle-pause"), WebInspector.UIString("Pause/ Continue"));
|
| + section.addAlternateKeys(WebInspector.shortcutRegistry.shortcutDescriptorsForAction("debugger.step-over"), WebInspector.UIString("Step over"));
|
| + section.addAlternateKeys(WebInspector.shortcutRegistry.shortcutDescriptorsForAction("debugger.step-into"), WebInspector.UIString("Step into"));
|
| + section.addAlternateKeys(WebInspector.shortcutRegistry.shortcutDescriptorsForAction("debugger.step-out"), WebInspector.UIString("Step out"));
|
| if (Runtime.experiments.isEnabled("stepIntoAsync"))
|
| - section.addAlternateKeys(WebInspector.ShortcutsScreen.SourcesPanelShortcuts.StepIntoAsync, WebInspector.UIString("Step into async"));
|
| + section.addAlternateKeys(WebInspector.shortcutRegistry.shortcutDescriptorsForAction("debugger.step-into"), WebInspector.UIString("Step into"));
|
|
|
| var nextAndPrevFrameKeys = WebInspector.ShortcutsScreen.SourcesPanelShortcuts.NextCallFrame.concat(WebInspector.ShortcutsScreen.SourcesPanelShortcuts.PrevCallFrame);
|
| section.addRelatedKeys(nextAndPrevFrameKeys, WebInspector.UIString("Next/previous call frame"));
|
| @@ -407,31 +407,6 @@ WebInspector.ShortcutsScreen.SourcesPanelShortcuts = {
|
| DecreaseCSSUnitByTen: [
|
| WebInspector.KeyboardShortcut.makeDescriptor(WebInspector.KeyboardShortcut.Keys.PageDown, WebInspector.KeyboardShortcut.Modifiers.Alt)
|
| ],
|
| -
|
| - RunSnippet: [
|
| - WebInspector.KeyboardShortcut.makeDescriptor(WebInspector.KeyboardShortcut.Keys.Enter, WebInspector.KeyboardShortcut.Modifiers.CtrlOrMeta)
|
| - ],
|
| -
|
| - StepOver: [
|
| - WebInspector.KeyboardShortcut.makeDescriptor(WebInspector.KeyboardShortcut.Keys.F10),
|
| - WebInspector.KeyboardShortcut.makeDescriptor(WebInspector.KeyboardShortcut.Keys.SingleQuote, WebInspector.KeyboardShortcut.Modifiers.CtrlOrMeta)
|
| - ],
|
| -
|
| - StepInto: [
|
| - WebInspector.KeyboardShortcut.makeDescriptor(WebInspector.KeyboardShortcut.Keys.F11),
|
| - WebInspector.KeyboardShortcut.makeDescriptor(WebInspector.KeyboardShortcut.Keys.Semicolon, WebInspector.KeyboardShortcut.Modifiers.CtrlOrMeta)
|
| - ],
|
| -
|
| - StepOut: [
|
| - WebInspector.KeyboardShortcut.makeDescriptor(WebInspector.KeyboardShortcut.Keys.F11, WebInspector.KeyboardShortcut.Modifiers.Shift),
|
| - WebInspector.KeyboardShortcut.makeDescriptor(WebInspector.KeyboardShortcut.Keys.Semicolon, WebInspector.KeyboardShortcut.Modifiers.Shift | WebInspector.KeyboardShortcut.Modifiers.CtrlOrMeta)
|
| - ],
|
| -
|
| - StepIntoAsync: [
|
| - WebInspector.KeyboardShortcut.makeDescriptor(WebInspector.KeyboardShortcut.Keys.F11, WebInspector.KeyboardShortcut.Modifiers.Alt),
|
| - WebInspector.KeyboardShortcut.makeDescriptor(WebInspector.KeyboardShortcut.Keys.Semicolon, WebInspector.KeyboardShortcut.Modifiers.Alt | WebInspector.KeyboardShortcut.Modifiers.CtrlOrMeta)
|
| - ],
|
| -
|
| EvaluateSelectionInConsole: [
|
| WebInspector.KeyboardShortcut.makeDescriptor("e", WebInspector.KeyboardShortcut.Modifiers.Shift | WebInspector.KeyboardShortcut.Modifiers.Ctrl)
|
| ],
|
|
|