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 494 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
505 } | 505 } |
506 contextMenu.appendCheckboxItem(WebInspector.UIString("Log XMLHttpRequest s"), monitoringXHRItemAction, WebInspector.settings.monitoringXHREnabled.get()); | 506 contextMenu.appendCheckboxItem(WebInspector.UIString("Log XMLHttpRequest s"), monitoringXHRItemAction, WebInspector.settings.monitoringXHREnabled.get()); |
507 | 507 |
508 function preserveLogItemAction() | 508 function preserveLogItemAction() |
509 { | 509 { |
510 WebInspector.settings.preserveConsoleLog.set(!WebInspector.settings. preserveConsoleLog.get()); | 510 WebInspector.settings.preserveConsoleLog.set(!WebInspector.settings. preserveConsoleLog.get()); |
511 } | 511 } |
512 contextMenu.appendCheckboxItem(WebInspector.UIString(WebInspector.useLow erCaseMenuTitles() ? "Preserve log upon navigation" : "Preserve Log upon Navigat ion"), preserveLogItemAction, WebInspector.settings.preserveConsoleLog.get()); | 512 contextMenu.appendCheckboxItem(WebInspector.UIString(WebInspector.useLow erCaseMenuTitles() ? "Preserve log upon navigation" : "Preserve Log upon Navigat ion"), preserveLogItemAction, WebInspector.settings.preserveConsoleLog.get()); |
513 | 513 |
514 var sourceElement = event.target.enclosingNodeOrSelfWithClass("console-m essage-wrapper"); | 514 var sourceElement = event.target.enclosingNodeOrSelfWithClass("console-m essage-wrapper"); |
515 var consoleMessage = sourceElement && sourceElement.message.consoleMessa ge(); | |
lushnikov
2014/05/28 09:10:21
Please use ternary operator
Dmitry Zvorygin
2014/05/28 11:38:10
Done.
| |
515 | 516 |
516 var filterSubMenu = contextMenu.appendSubMenuItem(WebInspector.UIString( "Filter")); | 517 var filterSubMenu = contextMenu.appendSubMenuItem(WebInspector.UIString( "Filter")); |
517 | 518 |
518 if (sourceElement && sourceElement.message.url) { | 519 if (consoleMessage.url) { |
lushnikov
2014/05/28 09:10:21
consoleMessage might be null here
Dmitry Zvorygin
2014/05/28 11:38:10
Done.
| |
519 var menuTitle = WebInspector.UIString(WebInspector.useLowerCaseMenuT itles() ? "Hide messages from %s" : "Hide Messages from %s", new WebInspector.Pa rsedURL(sourceElement.message.url).displayName); | 520 var menuTitle = WebInspector.UIString(WebInspector.useLowerCaseMenuT itles() ? "Hide messages from %s" : "Hide Messages from %s", new WebInspector.Pa rsedURL(consoleMessage.url).displayName); |
520 filterSubMenu.appendItem(menuTitle, this._filter.addMessageURLFilter .bind(this._filter, sourceElement.message.url)); | 521 filterSubMenu.appendItem(menuTitle, this._filter.addMessageURLFilter .bind(this._filter, consoleMessage.url)); |
521 } | 522 } |
522 | 523 |
523 filterSubMenu.appendSeparator(); | 524 filterSubMenu.appendSeparator(); |
524 var unhideAll = filterSubMenu.appendItem(WebInspector.UIString(WebInspec tor.useLowerCaseMenuTitles() ? "Unhide all" : "Unhide All"), this._filter.remove MessageURLFilter.bind(this._filter)); | 525 var unhideAll = filterSubMenu.appendItem(WebInspector.UIString(WebInspec tor.useLowerCaseMenuTitles() ? "Unhide all" : "Unhide All"), this._filter.remove MessageURLFilter.bind(this._filter)); |
525 filterSubMenu.appendSeparator(); | 526 filterSubMenu.appendSeparator(); |
526 | 527 |
527 var hasFilters = false; | 528 var hasFilters = false; |
528 | 529 |
529 for (var url in this._filter.messageURLFilters) { | 530 for (var url in this._filter.messageURLFilters) { |
530 filterSubMenu.appendCheckboxItem(String.sprintf("%s (%d)", new WebIn spector.ParsedURL(url).displayName, this._urlToMessageCount[url]), this._filter. removeMessageURLFilter.bind(this._filter, url), true); | 531 filterSubMenu.appendCheckboxItem(String.sprintf("%s (%d)", new WebIn spector.ParsedURL(url).displayName, this._urlToMessageCount[url]), this._filter. removeMessageURLFilter.bind(this._filter, url), true); |
531 hasFilters = true; | 532 hasFilters = true; |
532 } | 533 } |
533 | 534 |
534 filterSubMenu.setEnabled(hasFilters || (sourceElement && sourceElement.m essage.url)); | 535 filterSubMenu.setEnabled(hasFilters || (consoleMessage && consoleMessage .url)); |
535 unhideAll.setEnabled(hasFilters); | 536 unhideAll.setEnabled(hasFilters); |
536 | 537 |
537 contextMenu.appendSeparator(); | 538 contextMenu.appendSeparator(); |
538 contextMenu.appendItem(WebInspector.UIString(WebInspector.useLowerCaseMe nuTitles() ? "Clear console" : "Clear Console"), this._requestClearMessages.bind (this)); | 539 contextMenu.appendItem(WebInspector.UIString(WebInspector.useLowerCaseMe nuTitles() ? "Clear console" : "Clear Console"), this._requestClearMessages.bind (this)); |
539 | 540 |
540 var request = (sourceElement && sourceElement.message) ? sourceElement.m essage.request : null; | 541 var request = consoleMessage ? consoleMessage.request : null; |
541 if (request && request.type === WebInspector.resourceTypes.XHR) { | 542 if (request && request.type === WebInspector.resourceTypes.XHR) { |
542 contextMenu.appendSeparator(); | 543 contextMenu.appendSeparator(); |
543 contextMenu.appendItem(WebInspector.UIString("Replay XHR"), NetworkA gent.replayXHR.bind(null, request.requestId)); | 544 contextMenu.appendItem(WebInspector.UIString("Replay XHR"), NetworkA gent.replayXHR.bind(null, request.requestId)); |
544 } | 545 } |
545 | 546 |
546 contextMenu.show(); | 547 contextMenu.show(); |
547 }, | 548 }, |
548 | 549 |
549 /** | 550 /** |
550 * @param {!WebInspector.ConsoleViewMessage} lastMessage | 551 * @param {!WebInspector.ConsoleViewMessage} lastMessage |
(...skipping 577 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1128 WebInspector.ConsoleView.ShowConsoleActionDelegate.prototype = { | 1129 WebInspector.ConsoleView.ShowConsoleActionDelegate.prototype = { |
1129 /** | 1130 /** |
1130 * @return {boolean} | 1131 * @return {boolean} |
1131 */ | 1132 */ |
1132 handleAction: function() | 1133 handleAction: function() |
1133 { | 1134 { |
1134 WebInspector.console.show(); | 1135 WebInspector.console.show(); |
1135 return true; | 1136 return true; |
1136 } | 1137 } |
1137 } | 1138 } |
OLD | NEW |