OLD | NEW |
---|---|
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 13 matching lines...) Expand all Loading... | |
24 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 24 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
26 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 26 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
27 */ | 27 */ |
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: "core", | |
35 extensions: [ | |
36 { | |
37 type: "@WebInspector.ActionDelegate", | |
38 bindings: [ | |
pfeldman
2014/02/21 16:29:16
What about mac shortcuts? F5 should do what Cmd+R
apavlov
2014/02/24 09:57:57
Not quite. As per the current code, CtrlOrCmd+R re
pfeldman
2014/03/13 05:24:02
Ctrl+R vs F5 behaving differently is just an overs
apavlov
2014/03/17 13:40:59
Unified the behavior and removed logical expressio
| |
39 { | |
40 platform: "!mac", | |
41 shortcut: "F5" | |
42 }, | |
43 { | |
44 platform: "!mac", | |
45 shortcut: "Shift+F5" | |
46 }, | |
47 { | |
48 platform: "!mac", | |
49 shortcut: "Ctrl+F5" | |
50 } | |
51 ], | |
52 className: "WebInspector.ResourceTreeModel.ReloadPageActionDeleg ate" | |
53 }, | |
54 { | |
55 type: "@WebInspector.ActionDelegate", | |
56 bindings: [ | |
57 { | |
58 shortcut: "Esc" | |
59 } | |
60 ], | |
61 className: "WebInspector.InspectorView.DrawerToggleActionDelegat e" | |
62 }, | |
63 { | |
64 type: "@WebInspector.ActionDelegate", | |
65 bindings: [ | |
66 { | |
67 shortcut: "Ctrl+`" | |
68 } | |
69 ], | |
70 className: "WebInspector.InspectorView.ShowConsoleActionDelegate " | |
71 }, | |
72 { | |
73 type: "@WebInspector.ActionDelegate", | |
74 bindings: [ | |
75 { | |
76 shortcut: "CtrlOrMeta+R" | |
77 } | |
78 ], | |
79 className: "WebInspector.SkipAllPausesAndReloadActionDelegate" | |
80 }, | |
81 { | |
82 type: "@WebInspector.ActionDelegate", | |
83 bindings: [ | |
84 { | |
85 shortcut: "Alt+R" | |
86 } | |
87 ], | |
88 className: "WebInspector.DebugReloadActionDelegate" | |
89 } | |
90 ] | |
91 }, | |
92 { | |
34 name: "elements", | 93 name: "elements", |
35 extensions: [ | 94 extensions: [ |
36 { | 95 { |
37 type: "@WebInspector.Panel", | 96 type: "@WebInspector.Panel", |
38 name: "elements", | 97 name: "elements", |
39 title: "Elements", | 98 title: "Elements", |
40 order: 0, | 99 order: 0, |
41 className: "WebInspector.ElementsPanel" | 100 className: "WebInspector.ElementsPanel" |
42 }, | 101 }, |
43 { | 102 { |
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
134 type: "@WebInspector.Drawer.ViewFactory", | 193 type: "@WebInspector.Drawer.ViewFactory", |
135 name: "search", | 194 name: "search", |
136 title: "Search", | 195 title: "Search", |
137 order: "1", | 196 order: "1", |
138 className: "WebInspector.AdvancedSearchController.ViewFactory" | 197 className: "WebInspector.AdvancedSearchController.ViewFactory" |
139 }, | 198 }, |
140 { | 199 { |
141 type: "@WebInspector.Revealer", | 200 type: "@WebInspector.Revealer", |
142 contextTypes: ["WebInspector.UILocation"], | 201 contextTypes: ["WebInspector.UILocation"], |
143 className: "WebInspector.SourcesPanel.UILocationRevealer" | 202 className: "WebInspector.SourcesPanel.UILocationRevealer" |
203 }, | |
204 { | |
205 type: "@WebInspector.ActionDelegate", | |
206 bindings: [ | |
207 { | |
208 shortcut: "CtrlOrMeta+O" | |
pfeldman
2014/02/21 16:29:16
nonmac:"ctrl+o",
mac:"cmd+o"
apavlov
2014/02/24 09:57:57
CtrlOrMeta is a shortcut to this :) Fine with sepa
pfeldman
2014/03/13 05:24:02
It is not clear what this means and it would be ha
apavlov
2014/03/17 13:40:59
Yep, split these into "mac" and "win,linux" config
| |
209 }, | |
210 { | |
211 shortcut: "CtrlOrMeta+P" | |
212 }, | |
213 ], | |
214 className: "WebInspector.SourcesPanel.ShowGoToSourceDialogAction Delegate" | |
144 } | 215 } |
145 ], | 216 ], |
146 scripts: [ "SourcesPanel.js" ] | 217 scripts: [ "SourcesPanel.js" ] |
147 }, | 218 }, |
148 { | 219 { |
149 name: "timeline", | 220 name: "timeline", |
150 extensions: [ | 221 extensions: [ |
151 { | 222 { |
152 type: "@WebInspector.Panel", | 223 type: "@WebInspector.Panel", |
153 name: "timeline", | 224 name: "timeline", |
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
220 { | 291 { |
221 type: "@WebInspector.Drawer.ViewFactory", | 292 type: "@WebInspector.Drawer.ViewFactory", |
222 name: "console", | 293 name: "console", |
223 title: "Console", | 294 title: "Console", |
224 order: "0", | 295 order: "0", |
225 className: "WebInspector.ConsolePanel.ViewFactory" | 296 className: "WebInspector.ConsolePanel.ViewFactory" |
226 } | 297 } |
227 ] | 298 ] |
228 }, | 299 }, |
229 { | 300 { |
301 name: "settings", | |
302 extensions: [ | |
303 { | |
304 type: "@WebInspector.ActionDelegate", | |
305 bindings: [ | |
306 { | |
307 shortcut: "F1" | |
308 }, | |
309 { | |
310 shortcut: "?" | |
311 } | |
312 ], | |
313 className: "WebInspector.SettingsController.SettingsScreenAction Delegate" | |
314 } | |
315 ] | |
316 }, | |
317 { | |
318 name: "extensions", | |
230 extensions: [ | 319 extensions: [ |
231 { | 320 { |
232 type: "@WebInspector.ExtensionServerAPI", | 321 type: "@WebInspector.ExtensionServerAPI", |
233 className: "WebInspector.ExtensionServer" | 322 className: "WebInspector.ExtensionServer" |
234 } | 323 } |
235 ], | 324 ], |
236 name: "extensions", | |
237 scripts: [ "ExtensionServer.js" ] | 325 scripts: [ "ExtensionServer.js" ] |
238 }, | 326 }, |
239 { | 327 { |
240 name: "layers", | 328 name: "layers", |
241 extensions: [ | 329 extensions: [ |
242 { | 330 { |
243 type: "@WebInspector.Panel", | 331 type: "@WebInspector.Panel", |
244 name: "layers", | 332 name: "layers", |
245 title: "Layers", | 333 title: "Layers", |
246 order: 7, | 334 order: 7, |
(...skipping 19 matching lines...) Expand all Loading... | |
266 type: "@WebInspector.SourcesPanel.EditorAction", | 354 type: "@WebInspector.SourcesPanel.EditorAction", |
267 className: "WebInspector.InplaceFormatterEditorAction" | 355 className: "WebInspector.InplaceFormatterEditorAction" |
268 }, | 356 }, |
269 { | 357 { |
270 type: "@WebInspector.SourcesPanel.EditorAction", | 358 type: "@WebInspector.SourcesPanel.EditorAction", |
271 className: "WebInspector.ScriptFormatterEditorAction" | 359 className: "WebInspector.ScriptFormatterEditorAction" |
272 } | 360 } |
273 ] | 361 ] |
274 } | 362 } |
275 ]; | 363 ]; |
OLD | NEW |