| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. | 2 * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. |
| 3 * Copyright (C) 2009 Joseph Pecoraro | 3 * Copyright (C) 2009 Joseph Pecoraro |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * | 8 * |
| 9 * 1. Redistributions of source code must retain the above copyright | 9 * 1. Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 177 _consoleHistoryAutocompleteChanged: function() | 177 _consoleHistoryAutocompleteChanged: function() |
| 178 { | 178 { |
| 179 this._prompt.setAddCompletionsFromHistory(this._consoleHistoryAutocomple
teSetting.get()); | 179 this._prompt.setAddCompletionsFromHistory(this._consoleHistoryAutocomple
teSetting.get()); |
| 180 }, | 180 }, |
| 181 | 181 |
| 182 /** | 182 /** |
| 183 * @param {!WebInspector.Event} event | 183 * @param {!WebInspector.Event} event |
| 184 */ | 184 */ |
| 185 _onMainFrameNavigated: function(event) | 185 _onMainFrameNavigated: function(event) |
| 186 { | 186 { |
| 187 if (!WebInspector.moduleSetting("preserveConsoleLog").get()) |
| 188 return; |
| 187 var frame = /** @type {!WebInspector.ResourceTreeFrame} */(event.data); | 189 var frame = /** @type {!WebInspector.ResourceTreeFrame} */(event.data); |
| 188 WebInspector.console.log(WebInspector.UIString("Navigated to %s", frame.
url)); | 190 WebInspector.console.log(WebInspector.UIString("Navigated to %s", frame.
url)); |
| 189 }, | 191 }, |
| 190 | 192 |
| 191 _initConsoleMessages: function() | 193 _initConsoleMessages: function() |
| 192 { | 194 { |
| 193 var mainTarget = WebInspector.targetManager.mainTarget(); | 195 var mainTarget = WebInspector.targetManager.mainTarget(); |
| 194 if (!mainTarget || !mainTarget.resourceTreeModel.cachedResourcesLoaded()
) { | 196 if (!mainTarget || !mainTarget.resourceTreeModel.cachedResourcesLoaded()
) { |
| 195 WebInspector.targetManager.addModelListener(WebInspector.ResourceTre
eModel, WebInspector.ResourceTreeModel.EventTypes.CachedResourcesLoaded, this._o
nResourceTreeModelLoaded, this); | 197 WebInspector.targetManager.addModelListener(WebInspector.ResourceTre
eModel, WebInspector.ResourceTreeModel.EventTypes.CachedResourcesLoaded, this._o
nResourceTreeModelLoaded, this); |
| 196 return; | 198 return; |
| (...skipping 1143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1340 return true; | 1342 return true; |
| 1341 } | 1343 } |
| 1342 return false; | 1344 return false; |
| 1343 } | 1345 } |
| 1344 } | 1346 } |
| 1345 | 1347 |
| 1346 /** | 1348 /** |
| 1347 * @typedef {{messageIndex: number, matchIndex: number}} | 1349 * @typedef {{messageIndex: number, matchIndex: number}} |
| 1348 */ | 1350 */ |
| 1349 WebInspector.ConsoleView.RegexMatchRange; | 1351 WebInspector.ConsoleView.RegexMatchRange; |
| OLD | NEW |