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 315 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
326 | 326 |
327 new WebInspector.DebuggerScriptMapping(WebInspector.debuggerModel, WebIn
spector.workspace, WebInspector.networkWorkspaceBinding); | 327 new WebInspector.DebuggerScriptMapping(WebInspector.debuggerModel, WebIn
spector.workspace, WebInspector.networkWorkspaceBinding); |
328 WebInspector.liveEditSupport = new WebInspector.LiveEditSupport(WebInspe
ctor.workspace); | 328 WebInspector.liveEditSupport = new WebInspector.LiveEditSupport(WebInspe
ctor.workspace); |
329 new WebInspector.CSSStyleSheetMapping(WebInspector.cssModel, WebInspecto
r.workspace, WebInspector.networkWorkspaceBinding); | 329 new WebInspector.CSSStyleSheetMapping(WebInspector.cssModel, WebInspecto
r.workspace, WebInspector.networkWorkspaceBinding); |
330 new WebInspector.PresentationConsoleMessageHelper(WebInspector.workspace
); | 330 new WebInspector.PresentationConsoleMessageHelper(WebInspector.workspace
); |
331 | 331 |
332 // Create settings before loading modules. | 332 // Create settings before loading modules. |
333 WebInspector.settings.initializeBackendSettings(); | 333 WebInspector.settings.initializeBackendSettings(); |
334 | 334 |
335 this._registerModules(); | 335 this._registerModules(); |
336 WebInspector.KeyboardShortcut.registerActions(); | 336 WebInspector.actionRegistry = new WebInspector.ActionRegistry(); |
| 337 WebInspector.KeyboardShortcut.registerBindings(); |
337 | 338 |
338 WebInspector.panels = {}; | 339 WebInspector.panels = {}; |
339 WebInspector.inspectorView = new WebInspector.InspectorView(); | 340 WebInspector.inspectorView = new WebInspector.InspectorView(); |
340 // Screencast controller creates a root view itself. | 341 // Screencast controller creates a root view itself. |
341 if (mainTarget.canScreencast) | 342 if (mainTarget.canScreencast) |
342 this._screencastController = new WebInspector.ScreencastController()
; | 343 this._screencastController = new WebInspector.ScreencastController()
; |
343 else | 344 else |
344 this._createRootView(); | 345 this._createRootView(); |
345 this._createGlobalStatusBarItems(); | 346 this._createGlobalStatusBarItems(); |
346 | 347 |
(...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
666 WebInspector.Main.ReloadActionDelegate = function() | 667 WebInspector.Main.ReloadActionDelegate = function() |
667 { | 668 { |
668 } | 669 } |
669 | 670 |
670 WebInspector.Main.ReloadActionDelegate.prototype = { | 671 WebInspector.Main.ReloadActionDelegate.prototype = { |
671 /** | 672 /** |
672 * @return {boolean} | 673 * @return {boolean} |
673 */ | 674 */ |
674 handleAction: function() | 675 handleAction: function() |
675 { | 676 { |
676 if (!WebInspector.Dialog.currentInstance()) { | 677 WebInspector.debuggerModel.skipAllPauses(true, true); |
677 WebInspector.debuggerModel.skipAllPauses(true, true); | 678 WebInspector.resourceTreeModel.reloadPage(false); |
678 WebInspector.resourceTreeModel.reloadPage(false); | |
679 } | |
680 return true; | 679 return true; |
681 } | 680 } |
682 } | 681 } |
683 | 682 |
684 /** | 683 /** |
685 * @constructor | 684 * @constructor |
686 * @implements {WebInspector.ActionDelegate} | 685 * @implements {WebInspector.ActionDelegate} |
687 */ | 686 */ |
688 WebInspector.Main.HardReloadActionDelegate = function() | 687 WebInspector.Main.HardReloadActionDelegate = function() |
689 { | 688 { |
690 } | 689 } |
691 | 690 |
692 WebInspector.Main.HardReloadActionDelegate.prototype = { | 691 WebInspector.Main.HardReloadActionDelegate.prototype = { |
693 /** | 692 /** |
694 * @return {boolean} | 693 * @return {boolean} |
695 */ | 694 */ |
696 handleAction: function() | 695 handleAction: function() |
697 { | 696 { |
698 if (!WebInspector.Dialog.currentInstance()) { | 697 WebInspector.debuggerModel.skipAllPauses(true, true); |
699 WebInspector.debuggerModel.skipAllPauses(true, true); | 698 WebInspector.resourceTreeModel.reloadPage(true); |
700 WebInspector.resourceTreeModel.reloadPage(true); | |
701 } | |
702 return true; | 699 return true; |
703 } | 700 } |
704 } | 701 } |
705 | 702 |
706 /** | 703 /** |
707 * @constructor | 704 * @constructor |
708 * @implements {WebInspector.ActionDelegate} | 705 * @implements {WebInspector.ActionDelegate} |
709 */ | 706 */ |
710 WebInspector.Main.DebugReloadActionDelegate = function() | 707 WebInspector.Main.DebugReloadActionDelegate = function() |
711 { | 708 { |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
769 | 766 |
770 WebInspector.__defineGetter__("inspectedPageURL", function() | 767 WebInspector.__defineGetter__("inspectedPageURL", function() |
771 { | 768 { |
772 return WebInspector.resourceTreeModel.inspectedPageURL(); | 769 return WebInspector.resourceTreeModel.inspectedPageURL(); |
773 }); | 770 }); |
774 | 771 |
775 WebInspector.panel = function(name) | 772 WebInspector.panel = function(name) |
776 { | 773 { |
777 return WebInspector.inspectorView.panel(name); | 774 return WebInspector.inspectorView.panel(name); |
778 } | 775 } |
OLD | NEW |