OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2008 Apple Inc. All Rights Reserved. | 2 * Copyright (C) 2008 Apple 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 | 5 * modification, are permitted provided that the following conditions |
6 * are met: | 6 * are met: |
7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
(...skipping 991 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1002 section.addAlternateKeys([ shortcut1.name, shortcut2.name ], WebInspecto
r.UIString("Step into")); | 1002 section.addAlternateKeys([ shortcut1.name, shortcut2.name ], WebInspecto
r.UIString("Step into")); |
1003 | 1003 |
1004 // Step out. | 1004 // Step out. |
1005 handler = this.stepOutButton.click.bind(this.stepOutButton); | 1005 handler = this.stepOutButton.click.bind(this.stepOutButton); |
1006 shortcut1 = WebInspector.KeyboardShortcut.makeDescriptor(WebInspector.Ke
yboardShortcut.Keys.F11, WebInspector.KeyboardShortcut.Modifiers.Shift); | 1006 shortcut1 = WebInspector.KeyboardShortcut.makeDescriptor(WebInspector.Ke
yboardShortcut.Keys.F11, WebInspector.KeyboardShortcut.Modifiers.Shift); |
1007 this._shortcuts[shortcut1.key] = handler; | 1007 this._shortcuts[shortcut1.key] = handler; |
1008 shortcut2 = WebInspector.KeyboardShortcut.makeDescriptor(WebInspector.Ke
yboardShortcut.Keys.Semicolon, WebInspector.KeyboardShortcut.Modifiers.Shift, pl
atformSpecificModifier); | 1008 shortcut2 = WebInspector.KeyboardShortcut.makeDescriptor(WebInspector.Ke
yboardShortcut.Keys.Semicolon, WebInspector.KeyboardShortcut.Modifiers.Shift, pl
atformSpecificModifier); |
1009 this._shortcuts[shortcut2.key] = handler; | 1009 this._shortcuts[shortcut2.key] = handler; |
1010 section.addAlternateKeys([ shortcut1.name, shortcut2.name ], WebInspecto
r.UIString("Step out")); | 1010 section.addAlternateKeys([ shortcut1.name, shortcut2.name ], WebInspecto
r.UIString("Step out")); |
1011 | 1011 |
1012 shortcut1 = WebInspector.KeyboardShortcut.makeDescriptor("g", platformSp
ecificModifier); | 1012 var isMac = WebInspector.isMac(); |
| 1013 if (isMac) |
| 1014 shortcut1 = WebInspector.KeyboardShortcut.makeDescriptor("l", WebIns
pector.KeyboardShortcut.Modifiers.Meta); |
| 1015 else |
| 1016 shortcut1 = WebInspector.KeyboardShortcut.makeDescriptor("g", WebIns
pector.KeyboardShortcut.Modifiers.Ctrl); |
1013 this._shortcuts[shortcut1.key] = this.showGoToLineDialog.bind(this); | 1017 this._shortcuts[shortcut1.key] = this.showGoToLineDialog.bind(this); |
1014 section.addAlternateKeys([ shortcut1.name ], WebInspector.UIString("Go t
o Line")); | 1018 section.addAlternateKeys([ shortcut1.name ], WebInspector.UIString("Go t
o Line")); |
1015 this.sidebarPanes.callstack.registerShortcuts(section); | 1019 this.sidebarPanes.callstack.registerShortcuts(section); |
1016 }, | 1020 }, |
1017 | 1021 |
1018 searchCanceled: function() | 1022 searchCanceled: function() |
1019 { | 1023 { |
1020 WebInspector.updateSearchMatchesCount(0, this); | 1024 WebInspector.updateSearchMatchesCount(0, this); |
1021 | 1025 |
1022 if (this._searchView) | 1026 if (this._searchView) |
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1086 showGoToLineDialog: function(e) | 1090 showGoToLineDialog: function(e) |
1087 { | 1091 { |
1088 var view = this.visibleView; | 1092 var view = this.visibleView; |
1089 if (view) | 1093 if (view) |
1090 WebInspector.GoToLineDialog.show(view); | 1094 WebInspector.GoToLineDialog.show(view); |
1091 } | 1095 } |
1092 } | 1096 } |
1093 | 1097 |
1094 WebInspector.ScriptsPanel.prototype.__proto__ = WebInspector.Panel.prototype; | 1098 WebInspector.ScriptsPanel.prototype.__proto__ = WebInspector.Panel.prototype; |
1095 | 1099 |
OLD | NEW |