| 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 164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 175 /** | 175 /** |
| 176 * @return {!Console.ConsoleView} | 176 * @return {!Console.ConsoleView} |
| 177 */ | 177 */ |
| 178 static instance() { | 178 static instance() { |
| 179 if (!Console.ConsoleView._instance) | 179 if (!Console.ConsoleView._instance) |
| 180 Console.ConsoleView._instance = new Console.ConsoleView(); | 180 Console.ConsoleView._instance = new Console.ConsoleView(); |
| 181 return Console.ConsoleView._instance; | 181 return Console.ConsoleView._instance; |
| 182 } | 182 } |
| 183 | 183 |
| 184 static clearConsole() { | 184 static clearConsole() { |
| 185 SDK.multitargetConsoleModel.requestClearMessages(); | 185 SDK.consoleModel.requestClearMessages(); |
| 186 } | 186 } |
| 187 | 187 |
| 188 /** | 188 /** |
| 189 * @return {!UI.SearchableView} | 189 * @return {!UI.SearchableView} |
| 190 */ | 190 */ |
| 191 searchableView() { | 191 searchableView() { |
| 192 return this._searchableView; | 192 return this._searchableView; |
| 193 } | 193 } |
| 194 | 194 |
| 195 _clearHistory() { | 195 _clearHistory() { |
| (...skipping 22 matching lines...) Expand all Loading... |
| 218 * @param {!Common.Event} event | 218 * @param {!Common.Event} event |
| 219 */ | 219 */ |
| 220 _onResourceTreeModelLoaded(event) { | 220 _onResourceTreeModelLoaded(event) { |
| 221 var resourceTreeModel = /** @type {!SDK.ResourceTreeModel} */ (event.data); | 221 var resourceTreeModel = /** @type {!SDK.ResourceTreeModel} */ (event.data); |
| 222 resourceTreeModel.removeEventListener( | 222 resourceTreeModel.removeEventListener( |
| 223 SDK.ResourceTreeModel.Events.CachedResourcesLoaded, this._onResourceTree
ModelLoaded, this); | 223 SDK.ResourceTreeModel.Events.CachedResourcesLoaded, this._onResourceTree
ModelLoaded, this); |
| 224 this._fetchMultitargetMessages(); | 224 this._fetchMultitargetMessages(); |
| 225 } | 225 } |
| 226 | 226 |
| 227 _fetchMultitargetMessages() { | 227 _fetchMultitargetMessages() { |
| 228 SDK.multitargetConsoleModel.addEventListener(SDK.ConsoleModel.Events.Console
Cleared, this._consoleCleared, this); | 228 SDK.consoleModel.addEventListener(SDK.ConsoleModel.Events.ConsoleCleared, th
is._consoleCleared, this); |
| 229 SDK.multitargetConsoleModel.addEventListener( | 229 SDK.consoleModel.addEventListener(SDK.ConsoleModel.Events.MessageAdded, this
._onConsoleMessageAdded, this); |
| 230 SDK.ConsoleModel.Events.MessageAdded, this._onConsoleMessageAdded, this)
; | 230 SDK.consoleModel.addEventListener(SDK.ConsoleModel.Events.MessageUpdated, th
is._onConsoleMessageUpdated, this); |
| 231 SDK.multitargetConsoleModel.addEventListener( | 231 SDK.consoleModel.addEventListener(SDK.ConsoleModel.Events.CommandEvaluated,
this._commandEvaluated, this); |
| 232 SDK.ConsoleModel.Events.MessageUpdated, this._onConsoleMessageUpdated, t
his); | 232 SDK.consoleModel.messages().forEach(this._addConsoleMessage, this); |
| 233 SDK.multitargetConsoleModel.addEventListener( | |
| 234 SDK.ConsoleModel.Events.CommandEvaluated, this._commandEvaluated, this); | |
| 235 SDK.multitargetConsoleModel.messages().forEach(this._addConsoleMessage, this
); | |
| 236 this._viewport.invalidate(); | 233 this._viewport.invalidate(); |
| 237 } | 234 } |
| 238 | 235 |
| 239 /** | 236 /** |
| 240 * @override | 237 * @override |
| 241 * @return {number} | 238 * @return {number} |
| 242 */ | 239 */ |
| 243 itemCount() { | 240 itemCount() { |
| 244 return this._visibleViewMessages.length; | 241 return this._visibleViewMessages.length; |
| 245 } | 242 } |
| (...skipping 552 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 798 var message; | 795 var message; |
| 799 if (!exceptionDetails) { | 796 if (!exceptionDetails) { |
| 800 message = new SDK.ConsoleMessage( | 797 message = new SDK.ConsoleMessage( |
| 801 result.target(), SDK.ConsoleMessage.MessageSource.JS, level, '', SDK.C
onsoleMessage.MessageType.Result, | 798 result.target(), SDK.ConsoleMessage.MessageSource.JS, level, '', SDK.C
onsoleMessage.MessageType.Result, |
| 802 undefined, undefined, undefined, undefined, [result]); | 799 undefined, undefined, undefined, undefined, [result]); |
| 803 } else { | 800 } else { |
| 804 message = SDK.ConsoleMessage.fromException( | 801 message = SDK.ConsoleMessage.fromException( |
| 805 result.target(), exceptionDetails, SDK.ConsoleMessage.MessageType.Resu
lt, undefined, undefined); | 802 result.target(), exceptionDetails, SDK.ConsoleMessage.MessageType.Resu
lt, undefined, undefined); |
| 806 } | 803 } |
| 807 message.setOriginatingMessage(originatingConsoleMessage); | 804 message.setOriginatingMessage(originatingConsoleMessage); |
| 808 SDK.multitargetConsoleModel.addMessage(message); | 805 SDK.consoleModel.addMessage(message); |
| 809 } | 806 } |
| 810 | 807 |
| 811 /** | 808 /** |
| 812 * @param {!Common.Event} event | 809 * @param {!Common.Event} event |
| 813 */ | 810 */ |
| 814 _commandEvaluated(event) { | 811 _commandEvaluated(event) { |
| 815 var data = | 812 var data = |
| 816 /** @type {{result: ?SDK.RemoteObject, text: string, commandMessage: !SD
K.ConsoleMessage, exceptionDetails: (!Protocol.Runtime.ExceptionDetails|undefine
d)}} */ | 813 /** @type {{result: ?SDK.RemoteObject, text: string, commandMessage: !SD
K.ConsoleMessage, exceptionDetails: (!Protocol.Runtime.ExceptionDetails|undefine
d)}} */ |
| 817 (event.data); | 814 (event.data); |
| 818 this._prompt.history().pushHistoryItem(data.text); | 815 this._prompt.history().pushHistoryItem(data.text); |
| (...skipping 499 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1318 return true; | 1315 return true; |
| 1319 } | 1316 } |
| 1320 return false; | 1317 return false; |
| 1321 } | 1318 } |
| 1322 }; | 1319 }; |
| 1323 | 1320 |
| 1324 /** | 1321 /** |
| 1325 * @typedef {{messageIndex: number, matchIndex: number}} | 1322 * @typedef {{messageIndex: number, matchIndex: number}} |
| 1326 */ | 1323 */ |
| 1327 Console.ConsoleView.RegexMatchRange; | 1324 Console.ConsoleView.RegexMatchRange; |
| OLD | NEW |