Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (210929 => 210930)
--- trunk/Source/WebInspectorUI/ChangeLog 2017-01-19 18:20:30 UTC (rev 210929)
+++ trunk/Source/WebInspectorUI/ChangeLog 2017-01-19 18:31:08 UTC (rev 210930)
@@ -1,5 +1,33 @@
2017-01-19 Devin Rousso <[email protected]>
+ Web Inspector: Network Tab's "Clear Network Items" button should have keyboard shortcuts
+ https://bugs.webkit.org/show_bug.cgi?id=166943
+
+ Reviewed by Timothy Hatcher.
+
+ * Localizations/en.lproj/localizedStrings.js:
+
+ * UserInterface/Base/Main.js:
+ (WebInspector.contentLoaded):
+ (WebInspector._clear):
+ Move clear keyboard shortcut to main object and call _handleClearShortcut on the visible
+ content view if able.
+
+ * UserInterface/Controllers/_javascript_LogViewController.js:
+ (WebInspector._javascript_LogViewController):
+ (WebInspector._javascript_LogViewController.prototype.requestClearMessages):
+ (WebInspector._javascript_LogViewController.prototype._handleClearShortcut): Deleted.
+ * UserInterface/Views/LogContentView.js:
+ (WebInspector.LogContentView):
+ (WebInspector.LogContentView.prototype.handleClearShortcut):
+ Move logic for requesting to clear messages from the LogManager to a better named function.
+
+ * UserInterface/Views/NetworkGridContentView.js:
+ (WebInspector.NetworkGridContentView):
+ (WebInspector.NetworkGridContentView.prototype.handleClearShortcut):
+
+2017-01-19 Devin Rousso <[email protected]>
+
Web Inspector: Dashboard's log/error/warning help tag says "click to show the Console" even when clicking does nothing
https://bugs.webkit.org/show_bug.cgi?id=167102
Modified: trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (210929 => 210930)
--- trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2017-01-19 18:20:30 UTC (rev 210929)
+++ trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2017-01-19 18:31:08 UTC (rev 210930)
@@ -145,7 +145,7 @@
localizedStrings["Classes"] = "Classes";
localizedStrings["Clear"] = "Clear";
localizedStrings["Clear Log"] = "Clear Log";
-localizedStrings["Clear Network Items"] = "Clear Network Items";
+localizedStrings["Clear Network Items (%s)"] = "Clear Network Items (%s)";
localizedStrings["Clear Timeline"] = "Clear Timeline";
localizedStrings["Clear focus"] = "Clear focus";
localizedStrings["Clear log (%s or %s)"] = "Clear log (%s or %s)";
Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Main.js (210929 => 210930)
--- trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2017-01-19 18:20:30 UTC (rev 210929)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2017-01-19 18:31:08 UTC (rev 210930)
@@ -276,6 +276,8 @@
this.splitContentBrowser = new WebInspector.ContentBrowser(document.getElementById("split-content-browser"), this, disableBackForward, disableFindBanner);
this.splitContentBrowser.navigationBar.element.addEventListener("mousedown", this._consoleResizerMouseDown.bind(this));
+ this.clearKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl, "K", this._clear.bind(this));
+
this.quickConsole = new WebInspector.QuickConsole(document.getElementById("quick-console"));
this.quickConsole.addEventListener(WebInspector.QuickConsole.Event.DidResize, this._quickConsoleDidResize, this);
@@ -2018,6 +2020,19 @@
WebInspector.saveDataToFile(contentView.saveData, true);
};
+WebInspector._clear = function(event)
+{
+ let contentView = this.focusedOrVisibleContentView();
+ if (!contentView || typeof contentView.handleClearShortcut !== "function") {
+ // If the current content view is unable to handle this event, clear the console to reset
+ // the dashboard counters.
+ this.logManager.requestClearMessages();
+ return;
+ }
+
+ contentView.handleClearShortcut(event);
+};
+
WebInspector._copy = function(event)
{
var selection = window.getSelection();
Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/_javascript_LogViewController.js (210929 => 210930)
--- trunk/Source/WebInspectorUI/UserInterface/Controllers/_javascript_LogViewController.js 2017-01-19 18:20:30 UTC (rev 210929)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/_javascript_LogViewController.js 2017-01-19 18:31:08 UTC (rev 210930)
@@ -50,13 +50,12 @@
this._sessions = [];
- this.messagesClearKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl, "K", this._handleClearShortcut.bind(this));
- this.messagesAlternateClearKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.Control, "L", this._handleClearShortcut.bind(this), this._element);
+ this.messagesAlternateClearKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.Control, "L", this.requestClearMessages.bind(this), this._element);
this._messagesFindNextKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl, "G", this._handleFindNextShortcut.bind(this), this._element);
this._messagesFindPreviousKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl | WebInspector.KeyboardShortcut.Modifier.Shift, "G", this._handleFindPreviousShortcut.bind(this), this._element);
- this._promptAlternateClearKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.Control, "L", this._handleClearShortcut.bind(this), this._prompt.element);
+ this._promptAlternateClearKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.Control, "L", this.requestClearMessages.bind(this), this._prompt.element);
this._promptFindNextKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl, "G", this._handleFindNextShortcut.bind(this), this._prompt.element);
this._promptFindPreviousKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl | WebInspector.KeyboardShortcut.Modifier.Shift, "G", this._handleFindPreviousShortcut.bind(this), this._prompt.element);
@@ -192,6 +191,11 @@
this._scrollToBottomTimeout = setTimeout(delayedWork.bind(this), 0);
}
+ requestClearMessages()
+ {
+ WebInspector.logManager.requestClearMessages();
+ }
+
// Protected
consolePromptHistoryDidChange(prompt)
@@ -251,11 +255,6 @@
// Private
- _handleClearShortcut()
- {
- WebInspector.logManager.requestClearMessages();
- }
-
_handleFindNextShortcut()
{
this.delegate.highlightNextSearchMatch();
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js (210929 => 210930)
--- trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js 2017-01-19 18:20:30 UTC (rev 210929)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js 2017-01-19 18:31:08 UTC (rev 210930)
@@ -77,7 +77,7 @@
this._scopeBar = new WebInspector.ScopeBar("log-scope-bar", scopeBarItems, scopeBarItems[0]);
this._scopeBar.addEventListener(WebInspector.ScopeBar.Event.SelectionChanged, this._scopeBarSelectionDidChange, this);
- this._clearLogNavigationItem = new WebInspector.ButtonNavigationItem("clear-log", WebInspector.UIString("Clear log (%s or %s)").format(this._logViewController.messagesClearKeyboardShortcut.displayName, this._logViewController.messagesAlternateClearKeyboardShortcut.displayName), "Images/NavigationItemTrash.svg", 15, 15);
+ this._clearLogNavigationItem = new WebInspector.ButtonNavigationItem("clear-log", WebInspector.UIString("Clear log (%s or %s)").format(WebInspector.clearKeyboardShortcut.displayName, this._logViewController.messagesAlternateClearKeyboardShortcut.displayName), "Images/NavigationItemTrash.svg", 15, 15);
this._clearLogNavigationItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._clearLog, this);
var toolTip = WebInspector.UIString("Show console tab");
@@ -216,6 +216,11 @@
event.preventDefault();
}
+ handleClearShortcut(event)
+ {
+ this._logViewController.requestClearMessages();
+ }
+
findBannerRevealPreviousResult()
{
if (!this.hasPerformedSearch || isEmptyObject(this._searchMatches))
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/NetworkGridContentView.js (210929 => 210930)
--- trunk/Source/WebInspectorUI/UserInterface/Views/NetworkGridContentView.js 2017-01-19 18:20:30 UTC (rev 210929)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/NetworkGridContentView.js 2017-01-19 18:31:08 UTC (rev 210930)
@@ -101,7 +101,7 @@
networkTimeline.addEventListener(WebInspector.Timeline.Event.RecordAdded, this._networkTimelineRecordAdded, this);
networkTimeline.addEventListener(WebInspector.Timeline.Event.Reset, this._networkTimelineReset, this);
- this._clearNetworkItemsNavigationItem = new WebInspector.ButtonNavigationItem("clear-network-items", WebInspector.UIString("Clear Network Items"), "Images/NavigationItemTrash.svg", 15, 15);
+ this._clearNetworkItemsNavigationItem = new WebInspector.ButtonNavigationItem("clear-network-items", WebInspector.UIString("Clear Network Items (%s)").format(WebInspector.clearKeyboardShortcut.displayName), "Images/NavigationItemTrash.svg", 15, 15);
this._clearNetworkItemsNavigationItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, () => this.reset());
this._pendingRecords = [];
@@ -217,6 +217,11 @@
this._processPendingRecords();
}
+ handleClearShortcut(event)
+ {
+ this.reset();
+ }
+
// Private
_processPendingRecords()
