OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved. | 2 * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved. |
3 * Copyright (C) 2007 Matt Lilek (pewtermoose@gmail.com). | 3 * Copyright (C) 2007 Matt Lilek (pewtermoose@gmail.com). |
4 * Copyright (C) 2009 Joseph Pecoraro | 4 * Copyright (C) 2009 Joseph Pecoraro |
5 * | 5 * |
6 * Redistribution and use in source and binary forms, with or without | 6 * Redistribution and use in source and binary forms, with or without |
7 * modification, are permitted provided that the following conditions | 7 * modification, are permitted provided that the following conditions |
8 * are met: | 8 * are met: |
9 * | 9 * |
10 * 1. Redistributions of source code must retain the above copyright | 10 * 1. Redistributions of source code must retain the above copyright |
(...skipping 502 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
513 } | 513 } |
514 break; | 514 break; |
515 } | 515 } |
516 return false; | 516 return false; |
517 }, | 517 }, |
518 | 518 |
519 _postDocumentKeyDown: function(event) | 519 _postDocumentKeyDown: function(event) |
520 { | 520 { |
521 if (event.handled) | 521 if (event.handled) |
522 return; | 522 return; |
| 523 if (WebInspector.Dialog.currentInstance()) |
| 524 return; |
523 | 525 |
524 if (WebInspector.inspectorView.currentPanel()) { | 526 if (WebInspector.inspectorView.currentPanel()) { |
525 WebInspector.inspectorView.currentPanel().handleShortcut(event); | 527 WebInspector.inspectorView.currentPanel().handleShortcut(event); |
526 if (event.handled) { | 528 if (event.handled) { |
527 event.consume(true); | 529 event.consume(true); |
528 return; | 530 return; |
529 } | 531 } |
530 } | 532 } |
531 | 533 |
532 if (WebInspector.advancedSearchController.handleShortcut(event)) | 534 if (WebInspector.advancedSearchController.handleShortcut(event)) |
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
745 | 747 |
746 WebInspector.__defineGetter__("inspectedPageURL", function() | 748 WebInspector.__defineGetter__("inspectedPageURL", function() |
747 { | 749 { |
748 return WebInspector.resourceTreeModel.inspectedPageURL(); | 750 return WebInspector.resourceTreeModel.inspectedPageURL(); |
749 }); | 751 }); |
750 | 752 |
751 WebInspector.panel = function(name) | 753 WebInspector.panel = function(name) |
752 { | 754 { |
753 return WebInspector.inspectorView.panel(name); | 755 return WebInspector.inspectorView.panel(name); |
754 } | 756 } |
OLD | NEW |