| Index: third_party/WebKit/Source/devtools/front_end/components/ShortcutsScreen.js
|
| diff --git a/third_party/WebKit/Source/devtools/front_end/components/ShortcutsScreen.js b/third_party/WebKit/Source/devtools/front_end/components/ShortcutsScreen.js
|
| index 841eb8f8feed4b4590c9f2535b72d5b09f016ba0..b7ec5febf08228d99949b9fbba6815dc6dcf280a 100644
|
| --- a/third_party/WebKit/Source/devtools/front_end/components/ShortcutsScreen.js
|
| +++ b/third_party/WebKit/Source/devtools/front_end/components/ShortcutsScreen.js
|
| @@ -31,205 +31,205 @@
|
| /**
|
| * @unrestricted
|
| */
|
| -WebInspector.ShortcutsScreen = class {
|
| +Components.ShortcutsScreen = class {
|
| constructor() {
|
| - /** @type {!Object.<string, !WebInspector.ShortcutsSection>} */
|
| + /** @type {!Object.<string, !Components.ShortcutsSection>} */
|
| this._sections = {};
|
| }
|
|
|
| static registerShortcuts() {
|
| // Elements panel
|
| - var elementsSection = WebInspector.shortcutsScreen.section(WebInspector.UIString('Elements Panel'));
|
| + var elementsSection = Components.shortcutsScreen.section(Common.UIString('Elements Panel'));
|
|
|
| - var navigate = WebInspector.ShortcutsScreen.ElementsPanelShortcuts.NavigateUp.concat(
|
| - WebInspector.ShortcutsScreen.ElementsPanelShortcuts.NavigateDown);
|
| - elementsSection.addRelatedKeys(navigate, WebInspector.UIString('Navigate elements'));
|
| + var navigate = Components.ShortcutsScreen.ElementsPanelShortcuts.NavigateUp.concat(
|
| + Components.ShortcutsScreen.ElementsPanelShortcuts.NavigateDown);
|
| + elementsSection.addRelatedKeys(navigate, Common.UIString('Navigate elements'));
|
|
|
| - var expandCollapse = WebInspector.ShortcutsScreen.ElementsPanelShortcuts.Expand.concat(
|
| - WebInspector.ShortcutsScreen.ElementsPanelShortcuts.Collapse);
|
| - elementsSection.addRelatedKeys(expandCollapse, WebInspector.UIString('Expand/collapse'));
|
| + var expandCollapse = Components.ShortcutsScreen.ElementsPanelShortcuts.Expand.concat(
|
| + Components.ShortcutsScreen.ElementsPanelShortcuts.Collapse);
|
| + elementsSection.addRelatedKeys(expandCollapse, Common.UIString('Expand/collapse'));
|
|
|
| elementsSection.addAlternateKeys(
|
| - WebInspector.ShortcutsScreen.ElementsPanelShortcuts.EditAttribute, WebInspector.UIString('Edit attribute'));
|
| + Components.ShortcutsScreen.ElementsPanelShortcuts.EditAttribute, Common.UIString('Edit attribute'));
|
| elementsSection.addAlternateKeys(
|
| - WebInspector.ShortcutsScreen.ElementsPanelShortcuts.HideElement, WebInspector.UIString('Hide element'));
|
| + Components.ShortcutsScreen.ElementsPanelShortcuts.HideElement, Common.UIString('Hide element'));
|
| elementsSection.addAlternateKeys(
|
| - WebInspector.ShortcutsScreen.ElementsPanelShortcuts.ToggleEditAsHTML,
|
| - WebInspector.UIString('Toggle edit as HTML'));
|
| + Components.ShortcutsScreen.ElementsPanelShortcuts.ToggleEditAsHTML,
|
| + Common.UIString('Toggle edit as HTML'));
|
|
|
| - var stylesPaneSection = WebInspector.shortcutsScreen.section(WebInspector.UIString('Styles Pane'));
|
| + var stylesPaneSection = Components.shortcutsScreen.section(Common.UIString('Styles Pane'));
|
|
|
| - var nextPreviousProperty = WebInspector.ShortcutsScreen.ElementsPanelShortcuts.NextProperty.concat(
|
| - WebInspector.ShortcutsScreen.ElementsPanelShortcuts.PreviousProperty);
|
| - stylesPaneSection.addRelatedKeys(nextPreviousProperty, WebInspector.UIString('Next/previous property'));
|
| + var nextPreviousProperty = Components.ShortcutsScreen.ElementsPanelShortcuts.NextProperty.concat(
|
| + Components.ShortcutsScreen.ElementsPanelShortcuts.PreviousProperty);
|
| + stylesPaneSection.addRelatedKeys(nextPreviousProperty, Common.UIString('Next/previous property'));
|
|
|
| stylesPaneSection.addRelatedKeys(
|
| - WebInspector.ShortcutsScreen.ElementsPanelShortcuts.IncrementValue, WebInspector.UIString('Increment value'));
|
| + Components.ShortcutsScreen.ElementsPanelShortcuts.IncrementValue, Common.UIString('Increment value'));
|
| stylesPaneSection.addRelatedKeys(
|
| - WebInspector.ShortcutsScreen.ElementsPanelShortcuts.DecrementValue, WebInspector.UIString('Decrement value'));
|
| + Components.ShortcutsScreen.ElementsPanelShortcuts.DecrementValue, Common.UIString('Decrement value'));
|
|
|
| stylesPaneSection.addAlternateKeys(
|
| - WebInspector.ShortcutsScreen.ElementsPanelShortcuts.IncrementBy10,
|
| - WebInspector.UIString('Increment by %f', 10));
|
| + Components.ShortcutsScreen.ElementsPanelShortcuts.IncrementBy10,
|
| + Common.UIString('Increment by %f', 10));
|
| stylesPaneSection.addAlternateKeys(
|
| - WebInspector.ShortcutsScreen.ElementsPanelShortcuts.DecrementBy10,
|
| - WebInspector.UIString('Decrement by %f', 10));
|
| + Components.ShortcutsScreen.ElementsPanelShortcuts.DecrementBy10,
|
| + Common.UIString('Decrement by %f', 10));
|
|
|
| stylesPaneSection.addAlternateKeys(
|
| - WebInspector.ShortcutsScreen.ElementsPanelShortcuts.IncrementBy100,
|
| - WebInspector.UIString('Increment by %f', 100));
|
| + Components.ShortcutsScreen.ElementsPanelShortcuts.IncrementBy100,
|
| + Common.UIString('Increment by %f', 100));
|
| stylesPaneSection.addAlternateKeys(
|
| - WebInspector.ShortcutsScreen.ElementsPanelShortcuts.DecrementBy100,
|
| - WebInspector.UIString('Decrement by %f', 100));
|
| + Components.ShortcutsScreen.ElementsPanelShortcuts.DecrementBy100,
|
| + Common.UIString('Decrement by %f', 100));
|
|
|
| stylesPaneSection.addAlternateKeys(
|
| - WebInspector.ShortcutsScreen.ElementsPanelShortcuts.IncrementBy01,
|
| - WebInspector.UIString('Increment by %f', 0.1));
|
| + Components.ShortcutsScreen.ElementsPanelShortcuts.IncrementBy01,
|
| + Common.UIString('Increment by %f', 0.1));
|
| stylesPaneSection.addAlternateKeys(
|
| - WebInspector.ShortcutsScreen.ElementsPanelShortcuts.DecrementBy01,
|
| - WebInspector.UIString('Decrement by %f', 0.1));
|
| + Components.ShortcutsScreen.ElementsPanelShortcuts.DecrementBy01,
|
| + Common.UIString('Decrement by %f', 0.1));
|
|
|
| // Debugger
|
| - var section = WebInspector.shortcutsScreen.section(WebInspector.UIString('Debugger'));
|
| + var section = Components.shortcutsScreen.section(Common.UIString('Debugger'));
|
|
|
| section.addAlternateKeys(
|
| - WebInspector.shortcutRegistry.shortcutDescriptorsForAction('debugger.toggle-pause'),
|
| - WebInspector.UIString('Pause/ Continue'));
|
| + UI.shortcutRegistry.shortcutDescriptorsForAction('debugger.toggle-pause'),
|
| + Common.UIString('Pause/ Continue'));
|
| section.addAlternateKeys(
|
| - WebInspector.shortcutRegistry.shortcutDescriptorsForAction('debugger.step-over'),
|
| - WebInspector.UIString('Step over'));
|
| + UI.shortcutRegistry.shortcutDescriptorsForAction('debugger.step-over'),
|
| + Common.UIString('Step over'));
|
| section.addAlternateKeys(
|
| - WebInspector.shortcutRegistry.shortcutDescriptorsForAction('debugger.step-into'),
|
| - WebInspector.UIString('Step into'));
|
| + UI.shortcutRegistry.shortcutDescriptorsForAction('debugger.step-into'),
|
| + Common.UIString('Step into'));
|
| section.addAlternateKeys(
|
| - WebInspector.shortcutRegistry.shortcutDescriptorsForAction('debugger.step-out'),
|
| - WebInspector.UIString('Step out'));
|
| + UI.shortcutRegistry.shortcutDescriptorsForAction('debugger.step-out'),
|
| + Common.UIString('Step out'));
|
|
|
| - var nextAndPrevFrameKeys = WebInspector.ShortcutsScreen.SourcesPanelShortcuts.NextCallFrame.concat(
|
| - WebInspector.ShortcutsScreen.SourcesPanelShortcuts.PrevCallFrame);
|
| - section.addRelatedKeys(nextAndPrevFrameKeys, WebInspector.UIString('Next/previous call frame'));
|
| + var nextAndPrevFrameKeys = Components.ShortcutsScreen.SourcesPanelShortcuts.NextCallFrame.concat(
|
| + Components.ShortcutsScreen.SourcesPanelShortcuts.PrevCallFrame);
|
| + section.addRelatedKeys(nextAndPrevFrameKeys, Common.UIString('Next/previous call frame'));
|
|
|
| section.addAlternateKeys(
|
| - WebInspector.ShortcutsScreen.SourcesPanelShortcuts.EvaluateSelectionInConsole,
|
| - WebInspector.UIString('Evaluate selection in console'));
|
| + Components.ShortcutsScreen.SourcesPanelShortcuts.EvaluateSelectionInConsole,
|
| + Common.UIString('Evaluate selection in console'));
|
| section.addAlternateKeys(
|
| - WebInspector.ShortcutsScreen.SourcesPanelShortcuts.AddSelectionToWatch,
|
| - WebInspector.UIString('Add selection to watch'));
|
| + Components.ShortcutsScreen.SourcesPanelShortcuts.AddSelectionToWatch,
|
| + Common.UIString('Add selection to watch'));
|
| section.addAlternateKeys(
|
| - WebInspector.ShortcutsScreen.SourcesPanelShortcuts.ToggleBreakpoint,
|
| - WebInspector.UIString('Toggle breakpoint'));
|
| + Components.ShortcutsScreen.SourcesPanelShortcuts.ToggleBreakpoint,
|
| + Common.UIString('Toggle breakpoint'));
|
| section.addAlternateKeys(
|
| - WebInspector.shortcutRegistry.shortcutDescriptorsForAction('debugger.toggle-breakpoints-active'),
|
| - WebInspector.UIString('Toggle all breakpoints'));
|
| + UI.shortcutRegistry.shortcutDescriptorsForAction('debugger.toggle-breakpoints-active'),
|
| + Common.UIString('Toggle all breakpoints'));
|
|
|
| // Editing
|
| - section = WebInspector.shortcutsScreen.section(WebInspector.UIString('Text Editor'));
|
| + section = Components.shortcutsScreen.section(Common.UIString('Text Editor'));
|
| section.addAlternateKeys(
|
| - WebInspector.ShortcutsScreen.SourcesPanelShortcuts.GoToMember, WebInspector.UIString('Go to member'));
|
| + Components.ShortcutsScreen.SourcesPanelShortcuts.GoToMember, Common.UIString('Go to member'));
|
| section.addAlternateKeys(
|
| - WebInspector.ShortcutsScreen.SourcesPanelShortcuts.ToggleAutocompletion,
|
| - WebInspector.UIString('Autocompletion'));
|
| + Components.ShortcutsScreen.SourcesPanelShortcuts.ToggleAutocompletion,
|
| + Common.UIString('Autocompletion'));
|
| section.addAlternateKeys(
|
| - WebInspector.ShortcutsScreen.SourcesPanelShortcuts.GoToLine, WebInspector.UIString('Go to line'));
|
| + Components.ShortcutsScreen.SourcesPanelShortcuts.GoToLine, Common.UIString('Go to line'));
|
| section.addAlternateKeys(
|
| - WebInspector.ShortcutsScreen.SourcesPanelShortcuts.JumpToPreviousLocation,
|
| - WebInspector.UIString('Jump to previous editing location'));
|
| + Components.ShortcutsScreen.SourcesPanelShortcuts.JumpToPreviousLocation,
|
| + Common.UIString('Jump to previous editing location'));
|
| section.addAlternateKeys(
|
| - WebInspector.ShortcutsScreen.SourcesPanelShortcuts.JumpToNextLocation,
|
| - WebInspector.UIString('Jump to next editing location'));
|
| + Components.ShortcutsScreen.SourcesPanelShortcuts.JumpToNextLocation,
|
| + Common.UIString('Jump to next editing location'));
|
| section.addAlternateKeys(
|
| - WebInspector.ShortcutsScreen.SourcesPanelShortcuts.ToggleComment, WebInspector.UIString('Toggle comment'));
|
| + Components.ShortcutsScreen.SourcesPanelShortcuts.ToggleComment, Common.UIString('Toggle comment'));
|
| section.addAlternateKeys(
|
| - WebInspector.ShortcutsScreen.SourcesPanelShortcuts.IncreaseCSSUnitByOne,
|
| - WebInspector.UIString('Increment CSS unit by 1'));
|
| + Components.ShortcutsScreen.SourcesPanelShortcuts.IncreaseCSSUnitByOne,
|
| + Common.UIString('Increment CSS unit by 1'));
|
| section.addAlternateKeys(
|
| - WebInspector.ShortcutsScreen.SourcesPanelShortcuts.DecreaseCSSUnitByOne,
|
| - WebInspector.UIString('Decrement CSS unit by 1'));
|
| + Components.ShortcutsScreen.SourcesPanelShortcuts.DecreaseCSSUnitByOne,
|
| + Common.UIString('Decrement CSS unit by 1'));
|
| section.addAlternateKeys(
|
| - WebInspector.ShortcutsScreen.SourcesPanelShortcuts.IncreaseCSSUnitByTen,
|
| - WebInspector.UIString('Increment CSS unit by 10'));
|
| + Components.ShortcutsScreen.SourcesPanelShortcuts.IncreaseCSSUnitByTen,
|
| + Common.UIString('Increment CSS unit by 10'));
|
| section.addAlternateKeys(
|
| - WebInspector.ShortcutsScreen.SourcesPanelShortcuts.DecreaseCSSUnitByTen,
|
| - WebInspector.UIString('Decrement CSS unit by 10'));
|
| + Components.ShortcutsScreen.SourcesPanelShortcuts.DecreaseCSSUnitByTen,
|
| + Common.UIString('Decrement CSS unit by 10'));
|
| section.addAlternateKeys(
|
| - WebInspector.ShortcutsScreen.SourcesPanelShortcuts.SelectNextOccurrence,
|
| - WebInspector.UIString('Select next occurrence'));
|
| + Components.ShortcutsScreen.SourcesPanelShortcuts.SelectNextOccurrence,
|
| + Common.UIString('Select next occurrence'));
|
| section.addAlternateKeys(
|
| - WebInspector.ShortcutsScreen.SourcesPanelShortcuts.SoftUndo, WebInspector.UIString('Soft undo'));
|
| + Components.ShortcutsScreen.SourcesPanelShortcuts.SoftUndo, Common.UIString('Soft undo'));
|
| section.addAlternateKeys(
|
| - WebInspector.ShortcutsScreen.SourcesPanelShortcuts.GotoMatchingBracket,
|
| - WebInspector.UIString('Go to matching bracket'));
|
| + Components.ShortcutsScreen.SourcesPanelShortcuts.GotoMatchingBracket,
|
| + Common.UIString('Go to matching bracket'));
|
| section.addAlternateKeys(
|
| - WebInspector.ShortcutsScreen.SourcesPanelShortcuts.CloseEditorTab, WebInspector.UIString('Close editor tab'));
|
| + Components.ShortcutsScreen.SourcesPanelShortcuts.CloseEditorTab, Common.UIString('Close editor tab'));
|
| section.addAlternateKeys(
|
| - WebInspector.shortcutRegistry.shortcutDescriptorsForAction('sources.switch-file'),
|
| - WebInspector.UIString('Switch between files with the same name and different extensions.'));
|
| + UI.shortcutRegistry.shortcutDescriptorsForAction('sources.switch-file'),
|
| + Common.UIString('Switch between files with the same name and different extensions.'));
|
|
|
| // Timeline panel
|
| - section = WebInspector.shortcutsScreen.section(WebInspector.UIString('Timeline Panel'));
|
| + section = Components.shortcutsScreen.section(Common.UIString('Timeline Panel'));
|
| section.addAlternateKeys(
|
| - WebInspector.shortcutRegistry.shortcutDescriptorsForAction('timeline.toggle-recording'),
|
| - WebInspector.UIString('Start/stop recording'));
|
| + UI.shortcutRegistry.shortcutDescriptorsForAction('timeline.toggle-recording'),
|
| + Common.UIString('Start/stop recording'));
|
| section.addAlternateKeys(
|
| - WebInspector.shortcutRegistry.shortcutDescriptorsForAction('main.reload'),
|
| - WebInspector.UIString('Record page reload'));
|
| + UI.shortcutRegistry.shortcutDescriptorsForAction('main.reload'),
|
| + Common.UIString('Record page reload'));
|
| section.addAlternateKeys(
|
| - WebInspector.shortcutRegistry.shortcutDescriptorsForAction('timeline.save-to-file'),
|
| - WebInspector.UIString('Save timeline data'));
|
| + UI.shortcutRegistry.shortcutDescriptorsForAction('timeline.save-to-file'),
|
| + Common.UIString('Save timeline data'));
|
| section.addAlternateKeys(
|
| - WebInspector.shortcutRegistry.shortcutDescriptorsForAction('timeline.load-from-file'),
|
| - WebInspector.UIString('Load timeline data'));
|
| + UI.shortcutRegistry.shortcutDescriptorsForAction('timeline.load-from-file'),
|
| + Common.UIString('Load timeline data'));
|
| section.addRelatedKeys(
|
| - WebInspector.shortcutRegistry.shortcutDescriptorsForAction('timeline.jump-to-previous-frame')
|
| - .concat(WebInspector.shortcutRegistry.shortcutDescriptorsForAction('timeline.jump-to-next-frame')),
|
| - WebInspector.UIString('Jump to previous/next frame'));
|
| + UI.shortcutRegistry.shortcutDescriptorsForAction('timeline.jump-to-previous-frame')
|
| + .concat(UI.shortcutRegistry.shortcutDescriptorsForAction('timeline.jump-to-next-frame')),
|
| + Common.UIString('Jump to previous/next frame'));
|
|
|
| // Profiles panel
|
| - section = WebInspector.shortcutsScreen.section(WebInspector.UIString('Profiles Panel'));
|
| + section = Components.shortcutsScreen.section(Common.UIString('Profiles Panel'));
|
| section.addAlternateKeys(
|
| - WebInspector.shortcutRegistry.shortcutDescriptorsForAction('profiler.toggle-recording'),
|
| - WebInspector.UIString('Start/stop recording'));
|
| + UI.shortcutRegistry.shortcutDescriptorsForAction('profiler.toggle-recording'),
|
| + Common.UIString('Start/stop recording'));
|
|
|
| // Layers panel
|
| if (Runtime.experiments.isEnabled('layersPanel')) {
|
| - section = WebInspector.shortcutsScreen.section(WebInspector.UIString('Layers Panel'));
|
| + section = Components.shortcutsScreen.section(Common.UIString('Layers Panel'));
|
| section.addAlternateKeys(
|
| - WebInspector.ShortcutsScreen.LayersPanelShortcuts.ResetView, WebInspector.UIString('Reset view'));
|
| + Components.ShortcutsScreen.LayersPanelShortcuts.ResetView, Common.UIString('Reset view'));
|
| section.addAlternateKeys(
|
| - WebInspector.ShortcutsScreen.LayersPanelShortcuts.PanMode, WebInspector.UIString('Switch to pan mode'));
|
| + Components.ShortcutsScreen.LayersPanelShortcuts.PanMode, Common.UIString('Switch to pan mode'));
|
| section.addAlternateKeys(
|
| - WebInspector.ShortcutsScreen.LayersPanelShortcuts.RotateMode, WebInspector.UIString('Switch to rotate mode'));
|
| + Components.ShortcutsScreen.LayersPanelShortcuts.RotateMode, Common.UIString('Switch to rotate mode'));
|
| section.addAlternateKeys(
|
| - WebInspector.ShortcutsScreen.LayersPanelShortcuts.TogglePanRotate,
|
| - WebInspector.UIString('Temporarily toggle pan/rotate mode while held'));
|
| + Components.ShortcutsScreen.LayersPanelShortcuts.TogglePanRotate,
|
| + Common.UIString('Temporarily toggle pan/rotate mode while held'));
|
| section.addAlternateKeys(
|
| - WebInspector.ShortcutsScreen.LayersPanelShortcuts.ZoomIn, WebInspector.UIString('Zoom in'));
|
| + Components.ShortcutsScreen.LayersPanelShortcuts.ZoomIn, Common.UIString('Zoom in'));
|
| section.addAlternateKeys(
|
| - WebInspector.ShortcutsScreen.LayersPanelShortcuts.ZoomOut, WebInspector.UIString('Zoom out'));
|
| + Components.ShortcutsScreen.LayersPanelShortcuts.ZoomOut, Common.UIString('Zoom out'));
|
| section.addRelatedKeys(
|
| - WebInspector.ShortcutsScreen.LayersPanelShortcuts.Up.concat(
|
| - WebInspector.ShortcutsScreen.LayersPanelShortcuts.Down),
|
| - WebInspector.UIString('Pan or rotate up/down'));
|
| + Components.ShortcutsScreen.LayersPanelShortcuts.Up.concat(
|
| + Components.ShortcutsScreen.LayersPanelShortcuts.Down),
|
| + Common.UIString('Pan or rotate up/down'));
|
| section.addRelatedKeys(
|
| - WebInspector.ShortcutsScreen.LayersPanelShortcuts.Left.concat(
|
| - WebInspector.ShortcutsScreen.LayersPanelShortcuts.Right),
|
| - WebInspector.UIString('Pan or rotate left/right'));
|
| + Components.ShortcutsScreen.LayersPanelShortcuts.Left.concat(
|
| + Components.ShortcutsScreen.LayersPanelShortcuts.Right),
|
| + Common.UIString('Pan or rotate left/right'));
|
| }
|
| }
|
|
|
| /**
|
| * @param {string} name
|
| - * @return {!WebInspector.ShortcutsSection}
|
| + * @return {!Components.ShortcutsSection}
|
| */
|
| section(name) {
|
| var section = this._sections[name];
|
| if (!section)
|
| - this._sections[name] = section = new WebInspector.ShortcutsSection(name);
|
| + this._sections[name] = section = new Components.ShortcutsSection(name);
|
| return section;
|
| }
|
|
|
| /**
|
| - * @return {!WebInspector.Widget}
|
| + * @return {!UI.Widget}
|
| */
|
| createShortcutsTabView() {
|
| var orderedSections = [];
|
| @@ -240,10 +240,10 @@ WebInspector.ShortcutsScreen = class {
|
| }
|
| orderedSections.sort(compareSections);
|
|
|
| - var widget = new WebInspector.Widget();
|
| + var widget = new UI.Widget();
|
|
|
| widget.element.className = 'settings-tab-container'; // Override
|
| - widget.element.createChild('header').createChild('h3').createTextChild(WebInspector.UIString('Shortcuts'));
|
| + widget.element.createChild('header').createChild('h3').createTextChild(Common.UIString('Shortcuts'));
|
| var scrollPane = widget.element.createChild('div', 'help-container-wrapper');
|
| var container = scrollPane.createChild('div');
|
| container.className = 'help-content help-container';
|
| @@ -251,9 +251,9 @@ WebInspector.ShortcutsScreen = class {
|
| orderedSections[i].renderSection(container);
|
|
|
| var note = scrollPane.createChild('p', 'help-footnote');
|
| - note.appendChild(WebInspector.linkifyDocumentationURLAsNode(
|
| + note.appendChild(UI.linkifyDocumentationURLAsNode(
|
| 'iterate/inspect-styles/shortcuts',
|
| - WebInspector.UIString('Full list of DevTools keyboard shortcuts and gestures')));
|
| + Common.UIString('Full list of DevTools keyboard shortcuts and gestures')));
|
|
|
| return widget;
|
| }
|
| @@ -261,25 +261,25 @@ WebInspector.ShortcutsScreen = class {
|
|
|
| /**
|
| * We cannot initialize it here as localized strings are not loaded yet.
|
| - * @type {!WebInspector.ShortcutsScreen}
|
| + * @type {!Components.ShortcutsScreen}
|
| */
|
| -WebInspector.shortcutsScreen;
|
| +Components.shortcutsScreen;
|
|
|
| /**
|
| * @unrestricted
|
| */
|
| -WebInspector.ShortcutsSection = class {
|
| +Components.ShortcutsSection = class {
|
| /**
|
| * @param {string} name
|
| */
|
| constructor(name) {
|
| this.name = name;
|
| this._lines = /** @type {!Array.<!{key: !Node, text: string}>} */ ([]);
|
| - this.order = ++WebInspector.ShortcutsSection._sequenceNumber;
|
| + this.order = ++Components.ShortcutsSection._sequenceNumber;
|
| }
|
|
|
| /**
|
| - * @param {!WebInspector.KeyboardShortcut.Descriptor} key
|
| + * @param {!UI.KeyboardShortcut.Descriptor} key
|
| * @param {string} description
|
| */
|
| addKey(key, description) {
|
| @@ -287,7 +287,7 @@ WebInspector.ShortcutsSection = class {
|
| }
|
|
|
| /**
|
| - * @param {!Array.<!WebInspector.KeyboardShortcut.Descriptor>} keys
|
| + * @param {!Array.<!UI.KeyboardShortcut.Descriptor>} keys
|
| * @param {string} description
|
| */
|
| addRelatedKeys(keys, description) {
|
| @@ -295,11 +295,11 @@ WebInspector.ShortcutsSection = class {
|
| }
|
|
|
| /**
|
| - * @param {!Array.<!WebInspector.KeyboardShortcut.Descriptor>} keys
|
| + * @param {!Array.<!UI.KeyboardShortcut.Descriptor>} keys
|
| * @param {string} description
|
| */
|
| addAlternateKeys(keys, description) {
|
| - this._addLine(this._renderSequence(keys, WebInspector.UIString('or')), description);
|
| + this._addLine(this._renderSequence(keys, Common.UIString('or')), description);
|
| }
|
|
|
| /**
|
| @@ -330,7 +330,7 @@ WebInspector.ShortcutsSection = class {
|
| }
|
|
|
| /**
|
| - * @param {!Array.<!WebInspector.KeyboardShortcut.Descriptor>} sequence
|
| + * @param {!Array.<!UI.KeyboardShortcut.Descriptor>} sequence
|
| * @param {string} delimiter
|
| * @return {!Node}
|
| */
|
| @@ -340,7 +340,7 @@ WebInspector.ShortcutsSection = class {
|
| }
|
|
|
| /**
|
| - * @param {!WebInspector.KeyboardShortcut.Descriptor} key
|
| + * @param {!UI.KeyboardShortcut.Descriptor} key
|
| * @return {!Node}
|
| */
|
| _renderKey(key) {
|
| @@ -377,156 +377,156 @@ WebInspector.ShortcutsSection = class {
|
| }
|
| };
|
|
|
| -WebInspector.ShortcutsSection._sequenceNumber = 0;
|
| +Components.ShortcutsSection._sequenceNumber = 0;
|
|
|
|
|
| -WebInspector.ShortcutsScreen.ElementsPanelShortcuts = {
|
| - NavigateUp: [WebInspector.KeyboardShortcut.makeDescriptor(WebInspector.KeyboardShortcut.Keys.Up)],
|
| +Components.ShortcutsScreen.ElementsPanelShortcuts = {
|
| + NavigateUp: [UI.KeyboardShortcut.makeDescriptor(UI.KeyboardShortcut.Keys.Up)],
|
|
|
| - NavigateDown: [WebInspector.KeyboardShortcut.makeDescriptor(WebInspector.KeyboardShortcut.Keys.Down)],
|
| + NavigateDown: [UI.KeyboardShortcut.makeDescriptor(UI.KeyboardShortcut.Keys.Down)],
|
|
|
| - Expand: [WebInspector.KeyboardShortcut.makeDescriptor(WebInspector.KeyboardShortcut.Keys.Right)],
|
| + Expand: [UI.KeyboardShortcut.makeDescriptor(UI.KeyboardShortcut.Keys.Right)],
|
|
|
| - Collapse: [WebInspector.KeyboardShortcut.makeDescriptor(WebInspector.KeyboardShortcut.Keys.Left)],
|
| + Collapse: [UI.KeyboardShortcut.makeDescriptor(UI.KeyboardShortcut.Keys.Left)],
|
|
|
| - EditAttribute: [WebInspector.KeyboardShortcut.makeDescriptor(WebInspector.KeyboardShortcut.Keys.Enter)],
|
| + EditAttribute: [UI.KeyboardShortcut.makeDescriptor(UI.KeyboardShortcut.Keys.Enter)],
|
|
|
| - HideElement: [WebInspector.KeyboardShortcut.makeDescriptor(WebInspector.KeyboardShortcut.Keys.H)],
|
| + HideElement: [UI.KeyboardShortcut.makeDescriptor(UI.KeyboardShortcut.Keys.H)],
|
|
|
| - ToggleEditAsHTML: [WebInspector.KeyboardShortcut.makeDescriptor(WebInspector.KeyboardShortcut.Keys.F2)],
|
| + ToggleEditAsHTML: [UI.KeyboardShortcut.makeDescriptor(UI.KeyboardShortcut.Keys.F2)],
|
|
|
| - NextProperty: [WebInspector.KeyboardShortcut.makeDescriptor(WebInspector.KeyboardShortcut.Keys.Tab)],
|
| + NextProperty: [UI.KeyboardShortcut.makeDescriptor(UI.KeyboardShortcut.Keys.Tab)],
|
|
|
| - PreviousProperty: [WebInspector.KeyboardShortcut.makeDescriptor(
|
| - WebInspector.KeyboardShortcut.Keys.Tab, WebInspector.KeyboardShortcut.Modifiers.Shift)],
|
| + PreviousProperty: [UI.KeyboardShortcut.makeDescriptor(
|
| + UI.KeyboardShortcut.Keys.Tab, UI.KeyboardShortcut.Modifiers.Shift)],
|
|
|
| - IncrementValue: [WebInspector.KeyboardShortcut.makeDescriptor(WebInspector.KeyboardShortcut.Keys.Up)],
|
| + IncrementValue: [UI.KeyboardShortcut.makeDescriptor(UI.KeyboardShortcut.Keys.Up)],
|
|
|
| - DecrementValue: [WebInspector.KeyboardShortcut.makeDescriptor(WebInspector.KeyboardShortcut.Keys.Down)],
|
| + DecrementValue: [UI.KeyboardShortcut.makeDescriptor(UI.KeyboardShortcut.Keys.Down)],
|
|
|
| IncrementBy10: [
|
| - WebInspector.KeyboardShortcut.makeDescriptor(WebInspector.KeyboardShortcut.Keys.PageUp),
|
| - WebInspector.KeyboardShortcut.makeDescriptor(
|
| - WebInspector.KeyboardShortcut.Keys.Up, WebInspector.KeyboardShortcut.Modifiers.Shift)
|
| + UI.KeyboardShortcut.makeDescriptor(UI.KeyboardShortcut.Keys.PageUp),
|
| + UI.KeyboardShortcut.makeDescriptor(
|
| + UI.KeyboardShortcut.Keys.Up, UI.KeyboardShortcut.Modifiers.Shift)
|
| ],
|
|
|
| DecrementBy10: [
|
| - WebInspector.KeyboardShortcut.makeDescriptor(WebInspector.KeyboardShortcut.Keys.PageDown),
|
| - WebInspector.KeyboardShortcut.makeDescriptor(
|
| - WebInspector.KeyboardShortcut.Keys.Down, WebInspector.KeyboardShortcut.Modifiers.Shift)
|
| + UI.KeyboardShortcut.makeDescriptor(UI.KeyboardShortcut.Keys.PageDown),
|
| + UI.KeyboardShortcut.makeDescriptor(
|
| + UI.KeyboardShortcut.Keys.Down, UI.KeyboardShortcut.Modifiers.Shift)
|
| ],
|
|
|
| - IncrementBy100: [WebInspector.KeyboardShortcut.makeDescriptor(
|
| - WebInspector.KeyboardShortcut.Keys.PageUp, WebInspector.KeyboardShortcut.Modifiers.Shift)],
|
| + IncrementBy100: [UI.KeyboardShortcut.makeDescriptor(
|
| + UI.KeyboardShortcut.Keys.PageUp, UI.KeyboardShortcut.Modifiers.Shift)],
|
|
|
| - DecrementBy100: [WebInspector.KeyboardShortcut.makeDescriptor(
|
| - WebInspector.KeyboardShortcut.Keys.PageDown, WebInspector.KeyboardShortcut.Modifiers.Shift)],
|
| + DecrementBy100: [UI.KeyboardShortcut.makeDescriptor(
|
| + UI.KeyboardShortcut.Keys.PageDown, UI.KeyboardShortcut.Modifiers.Shift)],
|
|
|
| - IncrementBy01: [WebInspector.KeyboardShortcut.makeDescriptor(
|
| - WebInspector.KeyboardShortcut.Keys.Up, WebInspector.KeyboardShortcut.Modifiers.Alt)],
|
| + IncrementBy01: [UI.KeyboardShortcut.makeDescriptor(
|
| + UI.KeyboardShortcut.Keys.Up, UI.KeyboardShortcut.Modifiers.Alt)],
|
|
|
| - DecrementBy01: [WebInspector.KeyboardShortcut.makeDescriptor(
|
| - WebInspector.KeyboardShortcut.Keys.Down, WebInspector.KeyboardShortcut.Modifiers.Alt)]
|
| + DecrementBy01: [UI.KeyboardShortcut.makeDescriptor(
|
| + UI.KeyboardShortcut.Keys.Down, UI.KeyboardShortcut.Modifiers.Alt)]
|
| };
|
|
|
| -WebInspector.ShortcutsScreen.SourcesPanelShortcuts = {
|
| +Components.ShortcutsScreen.SourcesPanelShortcuts = {
|
| SelectNextOccurrence:
|
| - [WebInspector.KeyboardShortcut.makeDescriptor('d', WebInspector.KeyboardShortcut.Modifiers.CtrlOrMeta)],
|
| + [UI.KeyboardShortcut.makeDescriptor('d', UI.KeyboardShortcut.Modifiers.CtrlOrMeta)],
|
|
|
| - SoftUndo: [WebInspector.KeyboardShortcut.makeDescriptor('u', WebInspector.KeyboardShortcut.Modifiers.CtrlOrMeta)],
|
| + SoftUndo: [UI.KeyboardShortcut.makeDescriptor('u', UI.KeyboardShortcut.Modifiers.CtrlOrMeta)],
|
|
|
| GotoMatchingBracket:
|
| - [WebInspector.KeyboardShortcut.makeDescriptor('m', WebInspector.KeyboardShortcut.Modifiers.Ctrl)],
|
| + [UI.KeyboardShortcut.makeDescriptor('m', UI.KeyboardShortcut.Modifiers.Ctrl)],
|
|
|
| - ToggleAutocompletion: [WebInspector.KeyboardShortcut.makeDescriptor(
|
| - WebInspector.KeyboardShortcut.Keys.Space, WebInspector.KeyboardShortcut.Modifiers.Ctrl)],
|
| + ToggleAutocompletion: [UI.KeyboardShortcut.makeDescriptor(
|
| + UI.KeyboardShortcut.Keys.Space, UI.KeyboardShortcut.Modifiers.Ctrl)],
|
|
|
| - IncreaseCSSUnitByOne: [WebInspector.KeyboardShortcut.makeDescriptor(
|
| - WebInspector.KeyboardShortcut.Keys.Up, WebInspector.KeyboardShortcut.Modifiers.Alt)],
|
| + IncreaseCSSUnitByOne: [UI.KeyboardShortcut.makeDescriptor(
|
| + UI.KeyboardShortcut.Keys.Up, UI.KeyboardShortcut.Modifiers.Alt)],
|
|
|
| - DecreaseCSSUnitByOne: [WebInspector.KeyboardShortcut.makeDescriptor(
|
| - WebInspector.KeyboardShortcut.Keys.Down, WebInspector.KeyboardShortcut.Modifiers.Alt)],
|
| + DecreaseCSSUnitByOne: [UI.KeyboardShortcut.makeDescriptor(
|
| + UI.KeyboardShortcut.Keys.Down, UI.KeyboardShortcut.Modifiers.Alt)],
|
|
|
| - IncreaseCSSUnitByTen: [WebInspector.KeyboardShortcut.makeDescriptor(
|
| - WebInspector.KeyboardShortcut.Keys.PageUp, WebInspector.KeyboardShortcut.Modifiers.Alt)],
|
| + IncreaseCSSUnitByTen: [UI.KeyboardShortcut.makeDescriptor(
|
| + UI.KeyboardShortcut.Keys.PageUp, UI.KeyboardShortcut.Modifiers.Alt)],
|
|
|
| - DecreaseCSSUnitByTen: [WebInspector.KeyboardShortcut.makeDescriptor(
|
| - WebInspector.KeyboardShortcut.Keys.PageDown, WebInspector.KeyboardShortcut.Modifiers.Alt)],
|
| - EvaluateSelectionInConsole: [WebInspector.KeyboardShortcut.makeDescriptor(
|
| - 'e', WebInspector.KeyboardShortcut.Modifiers.Shift | WebInspector.KeyboardShortcut.Modifiers.Ctrl)],
|
| + DecreaseCSSUnitByTen: [UI.KeyboardShortcut.makeDescriptor(
|
| + UI.KeyboardShortcut.Keys.PageDown, UI.KeyboardShortcut.Modifiers.Alt)],
|
| + EvaluateSelectionInConsole: [UI.KeyboardShortcut.makeDescriptor(
|
| + 'e', UI.KeyboardShortcut.Modifiers.Shift | UI.KeyboardShortcut.Modifiers.Ctrl)],
|
|
|
| - AddSelectionToWatch: [WebInspector.KeyboardShortcut.makeDescriptor(
|
| - 'a', WebInspector.KeyboardShortcut.Modifiers.Shift | WebInspector.KeyboardShortcut.Modifiers.Ctrl)],
|
| + AddSelectionToWatch: [UI.KeyboardShortcut.makeDescriptor(
|
| + 'a', UI.KeyboardShortcut.Modifiers.Shift | UI.KeyboardShortcut.Modifiers.Ctrl)],
|
|
|
| - GoToMember: [WebInspector.KeyboardShortcut.makeDescriptor(
|
| - 'o', WebInspector.KeyboardShortcut.Modifiers.CtrlOrMeta | WebInspector.KeyboardShortcut.Modifiers.Shift)],
|
| + GoToMember: [UI.KeyboardShortcut.makeDescriptor(
|
| + 'o', UI.KeyboardShortcut.Modifiers.CtrlOrMeta | UI.KeyboardShortcut.Modifiers.Shift)],
|
|
|
| - GoToLine: [WebInspector.KeyboardShortcut.makeDescriptor('g', WebInspector.KeyboardShortcut.Modifiers.Ctrl)],
|
| + GoToLine: [UI.KeyboardShortcut.makeDescriptor('g', UI.KeyboardShortcut.Modifiers.Ctrl)],
|
|
|
| ToggleBreakpoint:
|
| - [WebInspector.KeyboardShortcut.makeDescriptor('b', WebInspector.KeyboardShortcut.Modifiers.CtrlOrMeta)],
|
| + [UI.KeyboardShortcut.makeDescriptor('b', UI.KeyboardShortcut.Modifiers.CtrlOrMeta)],
|
|
|
| - NextCallFrame: [WebInspector.KeyboardShortcut.makeDescriptor(
|
| - WebInspector.KeyboardShortcut.Keys.Period, WebInspector.KeyboardShortcut.Modifiers.Ctrl)],
|
| + NextCallFrame: [UI.KeyboardShortcut.makeDescriptor(
|
| + UI.KeyboardShortcut.Keys.Period, UI.KeyboardShortcut.Modifiers.Ctrl)],
|
|
|
| - PrevCallFrame: [WebInspector.KeyboardShortcut.makeDescriptor(
|
| - WebInspector.KeyboardShortcut.Keys.Comma, WebInspector.KeyboardShortcut.Modifiers.Ctrl)],
|
| + PrevCallFrame: [UI.KeyboardShortcut.makeDescriptor(
|
| + UI.KeyboardShortcut.Keys.Comma, UI.KeyboardShortcut.Modifiers.Ctrl)],
|
|
|
| - ToggleComment: [WebInspector.KeyboardShortcut.makeDescriptor(
|
| - WebInspector.KeyboardShortcut.Keys.Slash, WebInspector.KeyboardShortcut.Modifiers.CtrlOrMeta)],
|
| + ToggleComment: [UI.KeyboardShortcut.makeDescriptor(
|
| + UI.KeyboardShortcut.Keys.Slash, UI.KeyboardShortcut.Modifiers.CtrlOrMeta)],
|
|
|
| - JumpToPreviousLocation: [WebInspector.KeyboardShortcut.makeDescriptor(
|
| - WebInspector.KeyboardShortcut.Keys.Minus, WebInspector.KeyboardShortcut.Modifiers.Alt)],
|
| + JumpToPreviousLocation: [UI.KeyboardShortcut.makeDescriptor(
|
| + UI.KeyboardShortcut.Keys.Minus, UI.KeyboardShortcut.Modifiers.Alt)],
|
|
|
| - JumpToNextLocation: [WebInspector.KeyboardShortcut.makeDescriptor(
|
| - WebInspector.KeyboardShortcut.Keys.Plus, WebInspector.KeyboardShortcut.Modifiers.Alt)],
|
| + JumpToNextLocation: [UI.KeyboardShortcut.makeDescriptor(
|
| + UI.KeyboardShortcut.Keys.Plus, UI.KeyboardShortcut.Modifiers.Alt)],
|
|
|
| - CloseEditorTab: [WebInspector.KeyboardShortcut.makeDescriptor('w', WebInspector.KeyboardShortcut.Modifiers.Alt)],
|
| + CloseEditorTab: [UI.KeyboardShortcut.makeDescriptor('w', UI.KeyboardShortcut.Modifiers.Alt)],
|
|
|
| - Save: [WebInspector.KeyboardShortcut.makeDescriptor('s', WebInspector.KeyboardShortcut.Modifiers.CtrlOrMeta)],
|
| + Save: [UI.KeyboardShortcut.makeDescriptor('s', UI.KeyboardShortcut.Modifiers.CtrlOrMeta)],
|
|
|
| - SaveAll: [WebInspector.KeyboardShortcut.makeDescriptor(
|
| - 's', WebInspector.KeyboardShortcut.Modifiers.CtrlOrMeta | WebInspector.KeyboardShortcut.Modifiers.ShiftOrOption)],
|
| + SaveAll: [UI.KeyboardShortcut.makeDescriptor(
|
| + 's', UI.KeyboardShortcut.Modifiers.CtrlOrMeta | UI.KeyboardShortcut.Modifiers.ShiftOrOption)],
|
| };
|
|
|
| -WebInspector.ShortcutsScreen.LayersPanelShortcuts = {
|
| - ResetView: [WebInspector.KeyboardShortcut.makeDescriptor('0')],
|
| +Components.ShortcutsScreen.LayersPanelShortcuts = {
|
| + ResetView: [UI.KeyboardShortcut.makeDescriptor('0')],
|
|
|
| - PanMode: [WebInspector.KeyboardShortcut.makeDescriptor('x')],
|
| + PanMode: [UI.KeyboardShortcut.makeDescriptor('x')],
|
|
|
| - RotateMode: [WebInspector.KeyboardShortcut.makeDescriptor('v')],
|
| + RotateMode: [UI.KeyboardShortcut.makeDescriptor('v')],
|
|
|
| - TogglePanRotate: [WebInspector.KeyboardShortcut.makeDescriptor(WebInspector.KeyboardShortcut.Keys.Shift)],
|
| + TogglePanRotate: [UI.KeyboardShortcut.makeDescriptor(UI.KeyboardShortcut.Keys.Shift)],
|
|
|
| ZoomIn: [
|
| - WebInspector.KeyboardShortcut.makeDescriptor(
|
| - WebInspector.KeyboardShortcut.Keys.Plus, WebInspector.KeyboardShortcut.Modifiers.Shift),
|
| - WebInspector.KeyboardShortcut.makeDescriptor(WebInspector.KeyboardShortcut.Keys.NumpadPlus)
|
| + UI.KeyboardShortcut.makeDescriptor(
|
| + UI.KeyboardShortcut.Keys.Plus, UI.KeyboardShortcut.Modifiers.Shift),
|
| + UI.KeyboardShortcut.makeDescriptor(UI.KeyboardShortcut.Keys.NumpadPlus)
|
| ],
|
|
|
| ZoomOut: [
|
| - WebInspector.KeyboardShortcut.makeDescriptor(
|
| - WebInspector.KeyboardShortcut.Keys.Minus, WebInspector.KeyboardShortcut.Modifiers.Shift),
|
| - WebInspector.KeyboardShortcut.makeDescriptor(WebInspector.KeyboardShortcut.Keys.NumpadMinus)
|
| + UI.KeyboardShortcut.makeDescriptor(
|
| + UI.KeyboardShortcut.Keys.Minus, UI.KeyboardShortcut.Modifiers.Shift),
|
| + UI.KeyboardShortcut.makeDescriptor(UI.KeyboardShortcut.Keys.NumpadMinus)
|
| ],
|
|
|
| Up: [
|
| - WebInspector.KeyboardShortcut.makeDescriptor(WebInspector.KeyboardShortcut.Keys.Up),
|
| - WebInspector.KeyboardShortcut.makeDescriptor('w')
|
| + UI.KeyboardShortcut.makeDescriptor(UI.KeyboardShortcut.Keys.Up),
|
| + UI.KeyboardShortcut.makeDescriptor('w')
|
| ],
|
|
|
| Down: [
|
| - WebInspector.KeyboardShortcut.makeDescriptor(WebInspector.KeyboardShortcut.Keys.Down),
|
| - WebInspector.KeyboardShortcut.makeDescriptor('s')
|
| + UI.KeyboardShortcut.makeDescriptor(UI.KeyboardShortcut.Keys.Down),
|
| + UI.KeyboardShortcut.makeDescriptor('s')
|
| ],
|
|
|
| Left: [
|
| - WebInspector.KeyboardShortcut.makeDescriptor(WebInspector.KeyboardShortcut.Keys.Left),
|
| - WebInspector.KeyboardShortcut.makeDescriptor('a')
|
| + UI.KeyboardShortcut.makeDescriptor(UI.KeyboardShortcut.Keys.Left),
|
| + UI.KeyboardShortcut.makeDescriptor('a')
|
| ],
|
|
|
| Right: [
|
| - WebInspector.KeyboardShortcut.makeDescriptor(WebInspector.KeyboardShortcut.Keys.Right),
|
| - WebInspector.KeyboardShortcut.makeDescriptor('d')
|
| + UI.KeyboardShortcut.makeDescriptor(UI.KeyboardShortcut.Keys.Right),
|
| + UI.KeyboardShortcut.makeDescriptor('d')
|
| ]
|
| };
|
|
|