Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(28)

Side by Side Diff: Source/devtools/front_end/modules.js

Issue 218613013: DevTools: Decouple shortcuts from actions, introduce shortcut contexts (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Address comments - take 1 Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2014 Google Inc. All rights reserved. 2 * Copyright (C) 2014 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 10 *
(...skipping 17 matching lines...) Expand all
28 28
29 /** 29 /**
30 * @type {!Array.<!WebInspector.ModuleManager.ModuleDescriptor>} 30 * @type {!Array.<!WebInspector.ModuleManager.ModuleDescriptor>}
31 */ 31 */
32 var allDescriptors = [ 32 var allDescriptors = [
33 { 33 {
34 name: "main", 34 name: "main",
35 extensions: [ 35 extensions: [
36 { 36 {
37 type: "@WebInspector.ActionDelegate", 37 type: "@WebInspector.ActionDelegate",
38 actionId: "main.reload",
39 className: "WebInspector.Main.ReloadActionDelegate",
38 bindings: [ 40 bindings: [
39 { 41 {
40 platform: "windows,linux", 42 platform: "windows,linux",
41 shortcut: "F5 Ctrl+R" 43 shortcut: "F5 Ctrl+R"
42 }, 44 },
43 { 45 {
44 platform: "mac", 46 platform: "mac",
45 shortcut: "Meta+R" 47 shortcut: "Meta+R"
46 } 48 }
47 ], 49 ]
48 className: "WebInspector.Main.ReloadActionDelegate"
49 }, 50 },
50 { 51 {
51 type: "@WebInspector.ActionDelegate", 52 type: "@WebInspector.ActionDelegate",
53 actionId: "main.hard-reload",
54 className: "WebInspector.Main.HardReloadActionDelegate",
52 bindings: [ 55 bindings: [
53 { 56 {
54 platform: "windows,linux", 57 platform: "windows,linux",
55 shortcut: "Shift+F5 Ctrl+F5 Ctrl+Shift+F5 Shift+Ctrl+R" 58 shortcut: "Shift+F5 Ctrl+F5 Ctrl+Shift+F5 Shift+Ctrl+R"
56 }, 59 },
57 { 60 {
58 platform: "mac", 61 platform: "mac",
59 shortcut: "Shift+Meta+R" 62 shortcut: "Shift+Meta+R"
60 } 63 }
61 ], 64 ]
62 className: "WebInspector.Main.HardReloadActionDelegate"
63 }, 65 },
64 { 66 {
65 type: "@WebInspector.ActionDelegate", 67 type: "@WebInspector.ActionDelegate",
68 actionId: "main.toggle-drawer",
69 className: "WebInspector.InspectorView.DrawerToggleActionDelegat e",
66 bindings: [ 70 bindings: [
67 { 71 {
68 shortcut: "Esc" 72 shortcut: "Esc"
69 } 73 }
70 ], 74 ]
71 className: "WebInspector.InspectorView.DrawerToggleActionDelegat e"
72 }, 75 },
73 { 76 {
74 type: "@WebInspector.ActionDelegate", 77 type: "@WebInspector.ActionDelegate",
78 actionId: "main.debug-reload",
79 className: "WebInspector.Main.DebugReloadActionDelegate",
75 bindings: [ 80 bindings: [
76 { 81 {
77 shortcut: "Alt+R" 82 shortcut: "Alt+R",
78 } 83 }
79 ], 84 ]
80 className: "WebInspector.Main.DebugReloadActionDelegate"
81 }, 85 },
82 { 86 {
83 type: "ui-setting", 87 type: "ui-setting",
84 title: "Disable cache (while DevTools is open)", 88 title: "Disable cache (while DevTools is open)",
85 settingName: "cacheDisabled", 89 settingName: "cacheDisabled",
86 settingType: "checkbox" 90 settingType: "checkbox"
87 }, 91 },
88 { 92 {
89 type: "ui-setting", 93 type: "ui-setting",
90 section: "Appearance", 94 section: "Appearance",
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
296 }, 300 },
297 { 301 {
298 type: "navigator-view", 302 type: "navigator-view",
299 name: "snippets", 303 name: "snippets",
300 title: "Snippets", 304 title: "Snippets",
301 order: 3, 305 order: 3,
302 className: "WebInspector.SnippetsNavigatorView" 306 className: "WebInspector.SnippetsNavigatorView"
303 }, 307 },
304 { 308 {
305 type: "@WebInspector.ActionDelegate", 309 type: "@WebInspector.ActionDelegate",
310 actionId: "sources.go-to-source",
311 className: "WebInspector.SourcesPanel.ShowGoToSourceDialogAction Delegate",
306 bindings: [ 312 bindings: [
307 { 313 {
308 platform: "mac", 314 platform: "mac",
309 shortcut: "Meta+O Meta+P" 315 shortcut: "Meta+O Meta+P"
310 }, 316 },
311 { 317 {
312 platform: "windows,linux", 318 platform: "windows,linux",
313 shortcut: "Ctrl+O Ctrl+P" 319 shortcut: "Ctrl+O Ctrl+P"
314 } 320 }
315 ], 321 ]
316 className: "WebInspector.SourcesPanel.ShowGoToSourceDialogAction Delegate"
317 }, 322 },
318 { 323 {
319 type: "ui-setting", 324 type: "ui-setting",
320 settingName: "javaScriptDisabled", 325 settingName: "javaScriptDisabled",
321 settingType: "custom", 326 settingType: "custom",
322 className: "WebInspector.SourcesPanel.DisableJavaScriptSettingDe legate" 327 className: "WebInspector.SourcesPanel.DisableJavaScriptSettingDe legate"
323 }, 328 },
324 { 329 {
325 type: "ui-setting", 330 type: "ui-setting",
326 section: "Sources", 331 section: "Sources",
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
488 order: "0", 493 order: "0",
489 className: "WebInspector.ConsolePanel.WrapperView" 494 className: "WebInspector.ConsolePanel.WrapperView"
490 }, 495 },
491 { 496 {
492 type: "@WebInspector.Revealer", 497 type: "@WebInspector.Revealer",
493 contextTypes: ["WebInspector.ConsoleModel"], 498 contextTypes: ["WebInspector.ConsoleModel"],
494 className: "WebInspector.ConsolePanel.ConsoleRevealer" 499 className: "WebInspector.ConsolePanel.ConsoleRevealer"
495 }, 500 },
496 { 501 {
497 type: "@WebInspector.ActionDelegate", 502 type: "@WebInspector.ActionDelegate",
503 actionId: "console.show",
504 className: "WebInspector.ConsoleView.ShowConsoleActionDelegate",
498 bindings: [ 505 bindings: [
499 { 506 {
500 shortcut: "Ctrl+`" 507 shortcut: "Ctrl+`"
501 } 508 }
502 ], 509 ]
503 className: "WebInspector.ConsoleView.ShowConsoleActionDelegate"
504 }, 510 },
505 { 511 {
506 type: "ui-setting", 512 type: "ui-setting",
507 section: "Console", 513 section: "Console",
508 title: "Log XMLHttpRequests", 514 title: "Log XMLHttpRequests",
509 settingName: "monitoringXHREnabled", 515 settingName: "monitoringXHREnabled",
510 settingType: "checkbox" 516 settingType: "checkbox"
511 }, 517 },
512 { 518 {
513 type: "ui-setting", 519 type: "ui-setting",
(...skipping 17 matching lines...) Expand all
531 extensions: [ 537 extensions: [
532 { 538 {
533 type: "drawer-view", 539 type: "drawer-view",
534 name: "search", 540 name: "search",
535 title: "Search", 541 title: "Search",
536 order: "1", 542 order: "1",
537 className: "WebInspector.AdvancedSearchView" 543 className: "WebInspector.AdvancedSearchView"
538 }, 544 },
539 { 545 {
540 type: "@WebInspector.ActionDelegate", 546 type: "@WebInspector.ActionDelegate",
547 actionId: "search.toggle",
548 className: "WebInspector.AdvancedSearchView.ToggleDrawerViewAct ionDelegate",
541 bindings: [ 549 bindings: [
542 { 550 {
543 platform: "mac", 551 platform: "mac",
544 shortcut: "Meta+Alt+F" 552 shortcut: "Meta+Alt+F"
545 }, 553 },
546 { 554 {
547 platform: "windows,linux", 555 platform: "windows,linux",
548 shortcut: "Ctrl+Shift+F" 556 shortcut: "Ctrl+Shift+F"
549 } 557 }
550 ], 558 ]
551 className: "WebInspector.AdvancedSearchView.ToggleDrawerViewAct ionDelegate"
552 } 559 }
553 ], 560 ],
554 scripts: [ "AdvancedSearchView.js" ] 561 scripts: [ "AdvancedSearchView.js" ]
555 }, 562 },
556 { 563 {
557 name: "settings", 564 name: "settings",
558 extensions: [ 565 extensions: [
559 { 566 {
560 type: "@WebInspector.ActionDelegate", 567 type: "@WebInspector.ActionDelegate",
568 actionId: "settings.show",
569 className: "WebInspector.SettingsController.SettingsScreenAction Delegate",
561 bindings: [ 570 bindings: [
562 { 571 {
563 shortcut: "F1 Shift+?" 572 shortcut: "F1 Shift+?"
564 } 573 }
565 ], 574 ]
566 className: "WebInspector.SettingsController.SettingsScreenAction Delegate"
567 } 575 }
568 ] 576 ]
569 }, 577 },
570 { 578 {
571 name: "extensions", 579 name: "extensions",
572 extensions: [ 580 extensions: [
573 { 581 {
574 type: "@WebInspector.ExtensionServerAPI", 582 type: "@WebInspector.ExtensionServerAPI",
575 className: "WebInspector.ExtensionServer" 583 className: "WebInspector.ExtensionServer"
576 } 584 }
(...skipping 22 matching lines...) Expand all
599 name: "handler-registry", 607 name: "handler-registry",
600 extensions: [ 608 extensions: [
601 { 609 {
602 type: "@WebInspector.ContextMenu.Provider", 610 type: "@WebInspector.ContextMenu.Provider",
603 contextTypes: ["WebInspector.UISourceCode", "WebInspector.Resour ce", "WebInspector.NetworkRequest", "Node"], 611 contextTypes: ["WebInspector.UISourceCode", "WebInspector.Resour ce", "WebInspector.NetworkRequest", "Node"],
604 className: "WebInspector.HandlerRegistry.ContextMenuProvider" 612 className: "WebInspector.HandlerRegistry.ContextMenuProvider"
605 } 613 }
606 ] 614 ]
607 } 615 }
608 ]; 616 ];
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698