| 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.consoleModel.requestClearMessages(); | 185 ConsoleModel.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.consoleModel.addEventListener(SDK.ConsoleModel.Events.ConsoleCleared, th
is._consoleCleared, this); | 228 ConsoleModel.consoleModel.addEventListener( |
| 229 SDK.consoleModel.addEventListener(SDK.ConsoleModel.Events.MessageAdded, this
._onConsoleMessageAdded, this); | 229 ConsoleModel.ConsoleModel.Events.ConsoleCleared, this._consoleCleared, t
his); |
| 230 SDK.consoleModel.addEventListener(SDK.ConsoleModel.Events.MessageUpdated, th
is._onConsoleMessageUpdated, this); | 230 ConsoleModel.consoleModel.addEventListener( |
| 231 SDK.consoleModel.addEventListener(SDK.ConsoleModel.Events.CommandEvaluated,
this._commandEvaluated, this); | 231 ConsoleModel.ConsoleModel.Events.MessageAdded, this._onConsoleMessageAdd
ed, this); |
| 232 SDK.consoleModel.messages().forEach(this._addConsoleMessage, this); | 232 ConsoleModel.consoleModel.addEventListener( |
| 233 ConsoleModel.ConsoleModel.Events.MessageUpdated, this._onConsoleMessageU
pdated, this); |
| 234 ConsoleModel.consoleModel.addEventListener( |
| 235 ConsoleModel.ConsoleModel.Events.CommandEvaluated, this._commandEvaluate
d, this); |
| 236 ConsoleModel.consoleModel.messages().forEach(this._addConsoleMessage, this); |
| 233 this._viewport.invalidate(); | 237 this._viewport.invalidate(); |
| 234 } | 238 } |
| 235 | 239 |
| 236 /** | 240 /** |
| 237 * @override | 241 * @override |
| 238 * @return {number} | 242 * @return {number} |
| 239 */ | 243 */ |
| 240 itemCount() { | 244 itemCount() { |
| 241 return this._visibleViewMessages.length; | 245 return this._visibleViewMessages.length; |
| 242 } | 246 } |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 294 */ | 298 */ |
| 295 function messageAdded(event) { | 299 function messageAdded(event) { |
| 296 this._addSinkMessage(/** @type {!Common.Console.Message} */ (event.data)); | 300 this._addSinkMessage(/** @type {!Common.Console.Message} */ (event.data)); |
| 297 } | 301 } |
| 298 } | 302 } |
| 299 | 303 |
| 300 /** | 304 /** |
| 301 * @param {!Common.Console.Message} message | 305 * @param {!Common.Console.Message} message |
| 302 */ | 306 */ |
| 303 _addSinkMessage(message) { | 307 _addSinkMessage(message) { |
| 304 var level = SDK.ConsoleMessage.MessageLevel.Verbose; | 308 var level = ConsoleModel.ConsoleMessage.MessageLevel.Verbose; |
| 305 switch (message.level) { | 309 switch (message.level) { |
| 306 case Common.Console.MessageLevel.Info: | 310 case Common.Console.MessageLevel.Info: |
| 307 level = SDK.ConsoleMessage.MessageLevel.Info; | 311 level = ConsoleModel.ConsoleMessage.MessageLevel.Info; |
| 308 break; | 312 break; |
| 309 case Common.Console.MessageLevel.Error: | 313 case Common.Console.MessageLevel.Error: |
| 310 level = SDK.ConsoleMessage.MessageLevel.Error; | 314 level = ConsoleModel.ConsoleMessage.MessageLevel.Error; |
| 311 break; | 315 break; |
| 312 case Common.Console.MessageLevel.Warning: | 316 case Common.Console.MessageLevel.Warning: |
| 313 level = SDK.ConsoleMessage.MessageLevel.Warning; | 317 level = ConsoleModel.ConsoleMessage.MessageLevel.Warning; |
| 314 break; | 318 break; |
| 315 } | 319 } |
| 316 | 320 |
| 317 var consoleMessage = new SDK.ConsoleMessage( | 321 var consoleMessage = new ConsoleModel.ConsoleMessage( |
| 318 null, SDK.ConsoleMessage.MessageSource.Other, level, message.text, undef
ined, undefined, undefined, undefined, | 322 null, ConsoleModel.ConsoleMessage.MessageSource.Other, level, message.te
xt, undefined, undefined, undefined, |
| 319 undefined, undefined, undefined, message.timestamp); | 323 undefined, undefined, undefined, undefined, message.timestamp); |
| 320 this._addConsoleMessage(consoleMessage); | 324 this._addConsoleMessage(consoleMessage); |
| 321 } | 325 } |
| 322 | 326 |
| 323 _consoleTimestampsSettingChanged() { | 327 _consoleTimestampsSettingChanged() { |
| 324 this._updateMessageList(); | 328 this._updateMessageList(); |
| 325 this._consoleMessages.forEach(viewMessage => viewMessage.updateTimestamp()); | 329 this._consoleMessages.forEach(viewMessage => viewMessage.updateTimestamp()); |
| 326 } | 330 } |
| 327 | 331 |
| 328 _executionContextChanged() { | 332 _executionContextChanged() { |
| 329 this._prompt.clearAutocomplete(); | 333 this._prompt.clearAutocomplete(); |
| (...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 428 this._filterStatusText.setText(Common.UIString( | 432 this._filterStatusText.setText(Common.UIString( |
| 429 this._hiddenByFilterCount === 1 ? '1 item hidden by filters' : | 433 this._hiddenByFilterCount === 1 ? '1 item hidden by filters' : |
| 430 this._hiddenByFilterCount + ' items hi
dden by filters')); | 434 this._hiddenByFilterCount + ' items hi
dden by filters')); |
| 431 this._filterStatusText.setVisible(!!this._hiddenByFilterCount); | 435 this._filterStatusText.setVisible(!!this._hiddenByFilterCount); |
| 432 } | 436 } |
| 433 | 437 |
| 434 /** | 438 /** |
| 435 * @param {!Common.Event} event | 439 * @param {!Common.Event} event |
| 436 */ | 440 */ |
| 437 _onConsoleMessageAdded(event) { | 441 _onConsoleMessageAdded(event) { |
| 438 var message = /** @type {!SDK.ConsoleMessage} */ (event.data); | 442 var message = /** @type {!ConsoleModel.ConsoleMessage} */ (event.data); |
| 439 this._addConsoleMessage(message); | 443 this._addConsoleMessage(message); |
| 440 } | 444 } |
| 441 | 445 |
| 442 /** | 446 /** |
| 443 * @param {!SDK.ConsoleMessage} message | 447 * @param {!ConsoleModel.ConsoleMessage} message |
| 444 */ | 448 */ |
| 445 _addConsoleMessage(message) { | 449 _addConsoleMessage(message) { |
| 446 /** | 450 /** |
| 447 * @param {!Console.ConsoleViewMessage} viewMessage1 | 451 * @param {!Console.ConsoleViewMessage} viewMessage1 |
| 448 * @param {!Console.ConsoleViewMessage} viewMessage2 | 452 * @param {!Console.ConsoleViewMessage} viewMessage2 |
| 449 * @return {number} | 453 * @return {number} |
| 450 */ | 454 */ |
| 451 function compareTimestamps(viewMessage1, viewMessage2) { | 455 function compareTimestamps(viewMessage1, viewMessage2) { |
| 452 return SDK.ConsoleMessage.timestampComparator(viewMessage1.consoleMessage(
), viewMessage2.consoleMessage()); | 456 return ConsoleModel.ConsoleMessage.timestampComparator( |
| 457 viewMessage1.consoleMessage(), viewMessage2.consoleMessage()); |
| 453 } | 458 } |
| 454 | 459 |
| 455 if (message.type === SDK.ConsoleMessage.MessageType.Command || | 460 if (message.type === ConsoleModel.ConsoleMessage.MessageType.Command || |
| 456 message.type === SDK.ConsoleMessage.MessageType.Result) { | 461 message.type === ConsoleModel.ConsoleMessage.MessageType.Result) { |
| 457 message.timestamp = | 462 message.timestamp = |
| 458 this._consoleMessages.length ? this._consoleMessages.peekLast().consol
eMessage().timestamp : 0; | 463 this._consoleMessages.length ? this._consoleMessages.peekLast().consol
eMessage().timestamp : 0; |
| 459 } | 464 } |
| 460 var viewMessage = this._createViewMessage(message); | 465 var viewMessage = this._createViewMessage(message); |
| 461 message[this._viewMessageSymbol] = viewMessage; | 466 message[this._viewMessageSymbol] = viewMessage; |
| 462 var insertAt = this._consoleMessages.upperBound(viewMessage, compareTimestam
ps); | 467 var insertAt = this._consoleMessages.upperBound(viewMessage, compareTimestam
ps); |
| 463 var insertedInMiddle = insertAt < this._consoleMessages.length; | 468 var insertedInMiddle = insertAt < this._consoleMessages.length; |
| 464 this._consoleMessages.splice(insertAt, 0, viewMessage); | 469 this._consoleMessages.splice(insertAt, 0, viewMessage); |
| 465 | 470 |
| 466 if (this._urlToMessageCount[message.url]) | 471 if (this._urlToMessageCount[message.url]) |
| (...skipping 10 matching lines...) Expand all Loading... |
| 477 } | 482 } |
| 478 | 483 |
| 479 this._scheduleViewportRefresh(); | 484 this._scheduleViewportRefresh(); |
| 480 this._consoleMessageAddedForTest(viewMessage); | 485 this._consoleMessageAddedForTest(viewMessage); |
| 481 } | 486 } |
| 482 | 487 |
| 483 /** | 488 /** |
| 484 * @param {!Common.Event} event | 489 * @param {!Common.Event} event |
| 485 */ | 490 */ |
| 486 _onConsoleMessageUpdated(event) { | 491 _onConsoleMessageUpdated(event) { |
| 487 var message = /** @type {!SDK.ConsoleMessage} */ (event.data); | 492 var message = /** @type {!ConsoleModel.ConsoleMessage} */ (event.data); |
| 488 var viewMessage = message[this._viewMessageSymbol]; | 493 var viewMessage = message[this._viewMessageSymbol]; |
| 489 if (viewMessage) { | 494 if (viewMessage) { |
| 490 viewMessage.updateMessageElement(); | 495 viewMessage.updateMessageElement(); |
| 491 this._updateMessageList(); | 496 this._updateMessageList(); |
| 492 } | 497 } |
| 493 } | 498 } |
| 494 | 499 |
| 495 /** | 500 /** |
| 496 * @param {!Console.ConsoleViewMessage} viewMessage | 501 * @param {!Console.ConsoleViewMessage} viewMessage |
| 497 */ | 502 */ |
| 498 _consoleMessageAddedForTest(viewMessage) { | 503 _consoleMessageAddedForTest(viewMessage) { |
| 499 } | 504 } |
| 500 | 505 |
| 501 /** | 506 /** |
| 502 * @param {!Console.ConsoleViewMessage} viewMessage | 507 * @param {!Console.ConsoleViewMessage} viewMessage |
| 503 */ | 508 */ |
| 504 _appendMessageToEnd(viewMessage) { | 509 _appendMessageToEnd(viewMessage) { |
| 505 if (!this._filter.shouldBeVisible(viewMessage)) { | 510 if (!this._filter.shouldBeVisible(viewMessage)) { |
| 506 this._hiddenByFilterCount++; | 511 this._hiddenByFilterCount++; |
| 507 return; | 512 return; |
| 508 } | 513 } |
| 509 | 514 |
| 510 if (this._tryToCollapseMessages(viewMessage, this._visibleViewMessages.peekL
ast())) | 515 if (this._tryToCollapseMessages(viewMessage, this._visibleViewMessages.peekL
ast())) |
| 511 return; | 516 return; |
| 512 | 517 |
| 513 var lastMessage = this._visibleViewMessages.peekLast(); | 518 var lastMessage = this._visibleViewMessages.peekLast(); |
| 514 if (viewMessage.consoleMessage().type === SDK.ConsoleMessage.MessageType.End
Group) { | 519 if (viewMessage.consoleMessage().type === ConsoleModel.ConsoleMessage.Messag
eType.EndGroup) { |
| 515 if (lastMessage && !this._currentGroup.messagesHidden()) | 520 if (lastMessage && !this._currentGroup.messagesHidden()) |
| 516 lastMessage.incrementCloseGroupDecorationCount(); | 521 lastMessage.incrementCloseGroupDecorationCount(); |
| 517 this._currentGroup = this._currentGroup.parentGroup(); | 522 this._currentGroup = this._currentGroup.parentGroup(); |
| 518 return; | 523 return; |
| 519 } | 524 } |
| 520 if (!this._currentGroup.messagesHidden()) { | 525 if (!this._currentGroup.messagesHidden()) { |
| 521 var originatingMessage = viewMessage.consoleMessage().originatingMessage()
; | 526 var originatingMessage = viewMessage.consoleMessage().originatingMessage()
; |
| 522 if (lastMessage && originatingMessage && lastMessage.consoleMessage() ===
originatingMessage) | 527 if (lastMessage && originatingMessage && lastMessage.consoleMessage() ===
originatingMessage) |
| 523 lastMessage.toMessageElement().classList.add('console-adjacent-user-comm
and-result'); | 528 lastMessage.toMessageElement().classList.add('console-adjacent-user-comm
and-result'); |
| 524 | 529 |
| 525 this._visibleViewMessages.push(viewMessage); | 530 this._visibleViewMessages.push(viewMessage); |
| 526 this._searchMessage(this._visibleViewMessages.length - 1); | 531 this._searchMessage(this._visibleViewMessages.length - 1); |
| 527 } | 532 } |
| 528 | 533 |
| 529 if (viewMessage.consoleMessage().isGroupStartMessage()) | 534 if (viewMessage.consoleMessage().isGroupStartMessage()) |
| 530 this._currentGroup = new Console.ConsoleGroup(this._currentGroup, viewMess
age); | 535 this._currentGroup = new Console.ConsoleGroup(this._currentGroup, viewMess
age); |
| 531 | 536 |
| 532 this._messageAppendedForTests(); | 537 this._messageAppendedForTests(); |
| 533 } | 538 } |
| 534 | 539 |
| 535 _messageAppendedForTests() { | 540 _messageAppendedForTests() { |
| 536 // This method is sniffed in tests. | 541 // This method is sniffed in tests. |
| 537 } | 542 } |
| 538 | 543 |
| 539 /** | 544 /** |
| 540 * @param {!SDK.ConsoleMessage} message | 545 * @param {!ConsoleModel.ConsoleMessage} message |
| 541 * @return {!Console.ConsoleViewMessage} | 546 * @return {!Console.ConsoleViewMessage} |
| 542 */ | 547 */ |
| 543 _createViewMessage(message) { | 548 _createViewMessage(message) { |
| 544 var nestingLevel = this._currentGroup.nestingLevel(); | 549 var nestingLevel = this._currentGroup.nestingLevel(); |
| 545 switch (message.type) { | 550 switch (message.type) { |
| 546 case SDK.ConsoleMessage.MessageType.Command: | 551 case ConsoleModel.ConsoleMessage.MessageType.Command: |
| 547 return new Console.ConsoleCommand(message, this._linkifier, nestingLevel
); | 552 return new Console.ConsoleCommand(message, this._linkifier, nestingLevel
); |
| 548 case SDK.ConsoleMessage.MessageType.Result: | 553 case ConsoleModel.ConsoleMessage.MessageType.Result: |
| 549 return new Console.ConsoleCommandResult(message, this._linkifier, nestin
gLevel); | 554 return new Console.ConsoleCommandResult(message, this._linkifier, nestin
gLevel); |
| 550 case SDK.ConsoleMessage.MessageType.StartGroupCollapsed: | 555 case ConsoleModel.ConsoleMessage.MessageType.StartGroupCollapsed: |
| 551 case SDK.ConsoleMessage.MessageType.StartGroup: | 556 case ConsoleModel.ConsoleMessage.MessageType.StartGroup: |
| 552 return new Console.ConsoleGroupViewMessage(message, this._linkifier, nes
tingLevel); | 557 return new Console.ConsoleGroupViewMessage(message, this._linkifier, nes
tingLevel); |
| 553 default: | 558 default: |
| 554 return new Console.ConsoleViewMessage(message, this._linkifier, nestingL
evel); | 559 return new Console.ConsoleViewMessage(message, this._linkifier, nestingL
evel); |
| 555 } | 560 } |
| 556 } | 561 } |
| 557 | 562 |
| 558 _consoleCleared() { | 563 _consoleCleared() { |
| 559 this._currentMatchRangeIndex = -1; | 564 this._currentMatchRangeIndex = -1; |
| 560 this._consoleMessages = []; | 565 this._consoleMessages = []; |
| 561 this._updateMessageList(); | 566 this._updateMessageList(); |
| (...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 777 var shortcut = UI.KeyboardShortcut.makeKeyFromEvent(keyboardEvent); | 782 var shortcut = UI.KeyboardShortcut.makeKeyFromEvent(keyboardEvent); |
| 778 var handler = this._shortcuts[shortcut]; | 783 var handler = this._shortcuts[shortcut]; |
| 779 if (handler) { | 784 if (handler) { |
| 780 handler(); | 785 handler(); |
| 781 keyboardEvent.preventDefault(); | 786 keyboardEvent.preventDefault(); |
| 782 } | 787 } |
| 783 } | 788 } |
| 784 | 789 |
| 785 /** | 790 /** |
| 786 * @param {?SDK.RemoteObject} result | 791 * @param {?SDK.RemoteObject} result |
| 787 * @param {!SDK.ConsoleMessage} originatingConsoleMessage | 792 * @param {!ConsoleModel.ConsoleMessage} originatingConsoleMessage |
| 788 * @param {!Protocol.Runtime.ExceptionDetails=} exceptionDetails | 793 * @param {!Protocol.Runtime.ExceptionDetails=} exceptionDetails |
| 789 */ | 794 */ |
| 790 _printResult(result, originatingConsoleMessage, exceptionDetails) { | 795 _printResult(result, originatingConsoleMessage, exceptionDetails) { |
| 791 if (!result) | 796 if (!result) |
| 792 return; | 797 return; |
| 793 | 798 |
| 794 var level = !!exceptionDetails ? SDK.ConsoleMessage.MessageLevel.Error : SDK
.ConsoleMessage.MessageLevel.Info; | 799 var level = !!exceptionDetails ? ConsoleModel.ConsoleMessage.MessageLevel.Er
ror : |
| 800 ConsoleModel.ConsoleMessage.MessageLevel.In
fo; |
| 795 var message; | 801 var message; |
| 796 if (!exceptionDetails) { | 802 if (!exceptionDetails) { |
| 797 message = new SDK.ConsoleMessage( | 803 message = new ConsoleModel.ConsoleMessage( |
| 798 result.target(), SDK.ConsoleMessage.MessageSource.JS, level, '', SDK.C
onsoleMessage.MessageType.Result, | 804 result.target(), ConsoleModel.ConsoleMessage.MessageSource.JS, level,
'', |
| 799 undefined, undefined, undefined, undefined, [result]); | 805 ConsoleModel.ConsoleMessage.MessageType.Result, undefined, undefined,
undefined, undefined, [result]); |
| 800 } else { | 806 } else { |
| 801 message = SDK.ConsoleMessage.fromException( | 807 message = ConsoleModel.ConsoleMessage.fromException( |
| 802 result.target(), exceptionDetails, SDK.ConsoleMessage.MessageType.Resu
lt, undefined, undefined); | 808 result.target(), exceptionDetails, ConsoleModel.ConsoleMessage.Message
Type.Result, undefined, undefined); |
| 803 } | 809 } |
| 804 message.setOriginatingMessage(originatingConsoleMessage); | 810 message.setOriginatingMessage(originatingConsoleMessage); |
| 805 SDK.consoleModel.addMessage(message); | 811 ConsoleModel.consoleModel.addMessage(message); |
| 806 } | 812 } |
| 807 | 813 |
| 808 /** | 814 /** |
| 809 * @param {!Common.Event} event | 815 * @param {!Common.Event} event |
| 810 */ | 816 */ |
| 811 _commandEvaluated(event) { | 817 _commandEvaluated(event) { |
| 812 var data = | 818 var data = |
| 813 /** @type {{result: ?SDK.RemoteObject, text: string, commandMessage: !SD
K.ConsoleMessage, exceptionDetails: (!Protocol.Runtime.ExceptionDetails|undefine
d)}} */ | 819 /** @type {{result: ?SDK.RemoteObject, text: string, commandMessage: !Co
nsoleModel.ConsoleMessage, exceptionDetails: (!Protocol.Runtime.ExceptionDetails
|undefined)}} */ |
| 814 (event.data); | 820 (event.data); |
| 815 this._prompt.history().pushHistoryItem(data.text); | 821 this._prompt.history().pushHistoryItem(data.text); |
| 816 this._consoleHistorySetting.set( | 822 this._consoleHistorySetting.set( |
| 817 this._prompt.history().historyData().slice(-Console.ConsoleView.persiste
dHistorySize)); | 823 this._prompt.history().historyData().slice(-Console.ConsoleView.persiste
dHistorySize)); |
| 818 this._printResult(data.result, data.commandMessage, data.exceptionDetails); | 824 this._printResult(data.result, data.commandMessage, data.exceptionDetails); |
| 819 } | 825 } |
| 820 | 826 |
| 821 /** | 827 /** |
| 822 * @override | 828 * @override |
| 823 * @return {!Array.<!Element>} | 829 * @return {!Array.<!Element>} |
| (...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1038 */ | 1044 */ |
| 1039 constructor(filterChangedCallback) { | 1045 constructor(filterChangedCallback) { |
| 1040 this._showTargetMessagesCheckbox = new UI.ToolbarCheckbox( | 1046 this._showTargetMessagesCheckbox = new UI.ToolbarCheckbox( |
| 1041 Common.UIString('Selected context only'), | 1047 Common.UIString('Selected context only'), |
| 1042 Common.UIString('Only show messages from the current context (top, ifram
e, worker, extension)'), | 1048 Common.UIString('Only show messages from the current context (top, ifram
e, worker, extension)'), |
| 1043 filterChangedCallback); | 1049 filterChangedCallback); |
| 1044 this._filterChanged = filterChangedCallback; | 1050 this._filterChanged = filterChangedCallback; |
| 1045 | 1051 |
| 1046 this._messageURLFiltersSetting = Common.settings.createSetting('messageURLFi
lters', {}); | 1052 this._messageURLFiltersSetting = Common.settings.createSetting('messageURLFi
lters', {}); |
| 1047 this._messageLevelFiltersSetting = | 1053 this._messageLevelFiltersSetting = |
| 1048 Common.settings.createSetting('messageLevelFilters2', SDK.ConsoleMessage
.MessageLevel.Info); | 1054 Common.settings.createSetting('messageLevelFilters2', ConsoleModel.Conso
leMessage.MessageLevel.Info); |
| 1049 this._hideNetworkMessagesSetting = Common.moduleSetting('hideNetworkMessages
'); | 1055 this._hideNetworkMessagesSetting = Common.moduleSetting('hideNetworkMessages
'); |
| 1050 | 1056 |
| 1051 this._messageURLFiltersSetting.addChangeListener(this._filterChanged); | 1057 this._messageURLFiltersSetting.addChangeListener(this._filterChanged); |
| 1052 this._messageLevelFiltersSetting.addChangeListener(this._filterChanged); | 1058 this._messageLevelFiltersSetting.addChangeListener(this._filterChanged); |
| 1053 this._hideNetworkMessagesSetting.addChangeListener(this._filterChanged); | 1059 this._hideNetworkMessagesSetting.addChangeListener(this._filterChanged); |
| 1054 | 1060 |
| 1055 this._textFilterUI = new UI.ToolbarInput(Common.UIString('Filter'), 0.2, 1,
true); | 1061 this._textFilterUI = new UI.ToolbarInput(Common.UIString('Filter'), 0.2, 1,
true); |
| 1056 this._textFilterUI.addEventListener(UI.ToolbarInput.Event.TextChanged, this.
_textFilterChanged, this); | 1062 this._textFilterUI.addEventListener(UI.ToolbarInput.Event.TextChanged, this.
_textFilterChanged, this); |
| 1057 | 1063 |
| 1058 var levels = [ | 1064 var levels = [ |
| 1059 {value: SDK.ConsoleMessage.MessageLevel.Verbose, label: Common.UIString('V
erbose')}, | 1065 {value: ConsoleModel.ConsoleMessage.MessageLevel.Verbose, label: Common.UI
String('Verbose')}, |
| 1060 {value: SDK.ConsoleMessage.MessageLevel.Info, label: Common.UIString('Info
'), default: true}, | 1066 {value: ConsoleModel.ConsoleMessage.MessageLevel.Info, label: Common.UIStr
ing('Info'), default: true}, |
| 1061 {value: SDK.ConsoleMessage.MessageLevel.Warning, label: Common.UIString('W
arnings')}, | 1067 {value: ConsoleModel.ConsoleMessage.MessageLevel.Warning, label: Common.UI
String('Warnings')}, |
| 1062 {value: SDK.ConsoleMessage.MessageLevel.Error, label: Common.UIString('Err
ors')} | 1068 {value: ConsoleModel.ConsoleMessage.MessageLevel.Error, label: Common.UISt
ring('Errors')} |
| 1063 ]; | 1069 ]; |
| 1064 | 1070 |
| 1065 this._levelComboBox = | 1071 this._levelComboBox = |
| 1066 new UI.ToolbarSettingComboBox(levels, this._messageLevelFiltersSetting,
Common.UIString('Level')); | 1072 new UI.ToolbarSettingComboBox(levels, this._messageLevelFiltersSetting,
Common.UIString('Level')); |
| 1067 } | 1073 } |
| 1068 | 1074 |
| 1069 _textFilterChanged() { | 1075 _textFilterChanged() { |
| 1070 this._filterText = this._textFilterUI.value(); | 1076 this._filterText = this._textFilterUI.value(); |
| 1071 this._filterRegex = null; | 1077 this._filterRegex = null; |
| 1072 if (this._filterText.startsWith('/') && this._filterText.endsWith('/')) { | 1078 if (this._filterText.startsWith('/') && this._filterText.endsWith('/')) { |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1117 var executionContext = UI.context.flavor(SDK.ExecutionContext); | 1123 var executionContext = UI.context.flavor(SDK.ExecutionContext); |
| 1118 | 1124 |
| 1119 if (this._showTargetMessagesCheckbox.checked() && executionContext) { | 1125 if (this._showTargetMessagesCheckbox.checked() && executionContext) { |
| 1120 if (message.target() !== executionContext.target()) | 1126 if (message.target() !== executionContext.target()) |
| 1121 return false; | 1127 return false; |
| 1122 if (message.executionContextId && message.executionContextId !== execution
Context.id) | 1128 if (message.executionContextId && message.executionContextId !== execution
Context.id) |
| 1123 return false; | 1129 return false; |
| 1124 } | 1130 } |
| 1125 | 1131 |
| 1126 if (this._hideNetworkMessagesSetting.get() && | 1132 if (this._hideNetworkMessagesSetting.get() && |
| 1127 viewMessage.consoleMessage().source === SDK.ConsoleMessage.MessageSource
.Network) | 1133 viewMessage.consoleMessage().source === ConsoleModel.ConsoleMessage.Mess
ageSource.Network) |
| 1128 return false; | 1134 return false; |
| 1129 | 1135 |
| 1130 if (viewMessage.consoleMessage().isGroupMessage()) | 1136 if (viewMessage.consoleMessage().isGroupMessage()) |
| 1131 return true; | 1137 return true; |
| 1132 | 1138 |
| 1133 if (message.type === SDK.ConsoleMessage.MessageType.Result || | 1139 if (message.type === ConsoleModel.ConsoleMessage.MessageType.Result || |
| 1134 message.type === SDK.ConsoleMessage.MessageType.Command) | 1140 message.type === ConsoleModel.ConsoleMessage.MessageType.Command) |
| 1135 return true; | 1141 return true; |
| 1136 | 1142 |
| 1137 if (message.url && this._messageURLFiltersSetting.get()[message.url]) | 1143 if (message.url && this._messageURLFiltersSetting.get()[message.url]) |
| 1138 return false; | 1144 return false; |
| 1139 | 1145 |
| 1140 var filterOrdinal = SDK.ConsoleMessage.MessageLevel.ordinal( | 1146 var filterOrdinal = ConsoleModel.ConsoleMessage.MessageLevel.ordinal( |
| 1141 /** @type {!SDK.ConsoleMessage.MessageLevel} */ (this._messageLevelFilte
rsSetting.get())); | 1147 /** @type {!ConsoleModel.ConsoleMessage.MessageLevel} */ (this._messageL
evelFiltersSetting.get())); |
| 1142 if (message.level && SDK.ConsoleMessage.MessageLevel.ordinal(message.level)
< filterOrdinal) | 1148 if (message.level && ConsoleModel.ConsoleMessage.MessageLevel.ordinal(messag
e.level) < filterOrdinal) |
| 1143 return false; | 1149 return false; |
| 1144 | 1150 |
| 1145 if (this._filterRegex) { | 1151 if (this._filterRegex) { |
| 1146 if (!viewMessage.matchesFilterRegex(this._filterRegex)) | 1152 if (!viewMessage.matchesFilterRegex(this._filterRegex)) |
| 1147 return false; | 1153 return false; |
| 1148 } else if (this._filterText) { | 1154 } else if (this._filterText) { |
| 1149 if (!viewMessage.matchesFilterText(this._filterText)) | 1155 if (!viewMessage.matchesFilterText(this._filterText)) |
| 1150 return false; | 1156 return false; |
| 1151 } | 1157 } |
| 1152 | 1158 |
| 1153 return true; | 1159 return true; |
| 1154 } | 1160 } |
| 1155 | 1161 |
| 1156 reset() { | 1162 reset() { |
| 1157 this._messageURLFiltersSetting.set({}); | 1163 this._messageURLFiltersSetting.set({}); |
| 1158 this._messageLevelFiltersSetting.set(SDK.ConsoleMessage.MessageLevel.Info); | 1164 this._messageLevelFiltersSetting.set(ConsoleModel.ConsoleMessage.MessageLeve
l.Info); |
| 1159 this._showTargetMessagesCheckbox.inputElement.checked = false; | 1165 this._showTargetMessagesCheckbox.inputElement.checked = false; |
| 1160 this._hideNetworkMessagesSetting.set(false); | 1166 this._hideNetworkMessagesSetting.set(false); |
| 1161 this._textFilterUI.setValue(''); | 1167 this._textFilterUI.setValue(''); |
| 1162 this._textFilterChanged(); | 1168 this._textFilterChanged(); |
| 1163 } | 1169 } |
| 1164 }; | 1170 }; |
| 1165 | 1171 |
| 1166 /** | 1172 /** |
| 1167 * @unrestricted | 1173 * @unrestricted |
| 1168 */ | 1174 */ |
| 1169 Console.ConsoleCommand = class extends Console.ConsoleViewMessage { | 1175 Console.ConsoleCommand = class extends Console.ConsoleViewMessage { |
| 1170 /** | 1176 /** |
| 1171 * @param {!SDK.ConsoleMessage} message | 1177 * @param {!ConsoleModel.ConsoleMessage} message |
| 1172 * @param {!Components.Linkifier} linkifier | 1178 * @param {!Components.Linkifier} linkifier |
| 1173 * @param {number} nestingLevel | 1179 * @param {number} nestingLevel |
| 1174 */ | 1180 */ |
| 1175 constructor(message, linkifier, nestingLevel) { | 1181 constructor(message, linkifier, nestingLevel) { |
| 1176 super(message, linkifier, nestingLevel); | 1182 super(message, linkifier, nestingLevel); |
| 1177 } | 1183 } |
| 1178 | 1184 |
| 1179 /** | 1185 /** |
| 1180 * @override | 1186 * @override |
| 1181 * @return {!Element} | 1187 * @return {!Element} |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1214 * @const | 1220 * @const |
| 1215 * @type {number} | 1221 * @type {number} |
| 1216 */ | 1222 */ |
| 1217 Console.ConsoleCommand.MaxLengthToIgnoreHighlighter = 10000; | 1223 Console.ConsoleCommand.MaxLengthToIgnoreHighlighter = 10000; |
| 1218 | 1224 |
| 1219 /** | 1225 /** |
| 1220 * @unrestricted | 1226 * @unrestricted |
| 1221 */ | 1227 */ |
| 1222 Console.ConsoleCommandResult = class extends Console.ConsoleViewMessage { | 1228 Console.ConsoleCommandResult = class extends Console.ConsoleViewMessage { |
| 1223 /** | 1229 /** |
| 1224 * @param {!SDK.ConsoleMessage} message | 1230 * @param {!ConsoleModel.ConsoleMessage} message |
| 1225 * @param {!Components.Linkifier} linkifier | 1231 * @param {!Components.Linkifier} linkifier |
| 1226 * @param {number} nestingLevel | 1232 * @param {number} nestingLevel |
| 1227 */ | 1233 */ |
| 1228 constructor(message, linkifier, nestingLevel) { | 1234 constructor(message, linkifier, nestingLevel) { |
| 1229 super(message, linkifier, nestingLevel); | 1235 super(message, linkifier, nestingLevel); |
| 1230 } | 1236 } |
| 1231 | 1237 |
| 1232 /** | 1238 /** |
| 1233 * @override | 1239 * @override |
| 1234 * @return {!Element} | 1240 * @return {!Element} |
| 1235 */ | 1241 */ |
| 1236 contentElement() { | 1242 contentElement() { |
| 1237 var element = super.contentElement(); | 1243 var element = super.contentElement(); |
| 1238 if (!element.classList.contains('console-user-command-result')) { | 1244 if (!element.classList.contains('console-user-command-result')) { |
| 1239 element.classList.add('console-user-command-result'); | 1245 element.classList.add('console-user-command-result'); |
| 1240 if (this.consoleMessage().level === SDK.ConsoleMessage.MessageLevel.Info)
{ | 1246 if (this.consoleMessage().level === ConsoleModel.ConsoleMessage.MessageLev
el.Info) { |
| 1241 var icon = UI.Icon.create('smallicon-command-result', 'command-result-ic
on'); | 1247 var icon = UI.Icon.create('smallicon-command-result', 'command-result-ic
on'); |
| 1242 element.insertBefore(icon, element.firstChild); | 1248 element.insertBefore(icon, element.firstChild); |
| 1243 } | 1249 } |
| 1244 } | 1250 } |
| 1245 return element; | 1251 return element; |
| 1246 } | 1252 } |
| 1247 }; | 1253 }; |
| 1248 | 1254 |
| 1249 /** | 1255 /** |
| 1250 * @unrestricted | 1256 * @unrestricted |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1315 return true; | 1321 return true; |
| 1316 } | 1322 } |
| 1317 return false; | 1323 return false; |
| 1318 } | 1324 } |
| 1319 }; | 1325 }; |
| 1320 | 1326 |
| 1321 /** | 1327 /** |
| 1322 * @typedef {{messageIndex: number, matchIndex: number}} | 1328 * @typedef {{messageIndex: number, matchIndex: number}} |
| 1323 */ | 1329 */ |
| 1324 Console.ConsoleView.RegexMatchRange; | 1330 Console.ConsoleView.RegexMatchRange; |
| OLD | NEW |