Commit 6be8da1a authored by Joel Einbinder's avatar Joel Einbinder Committed by Commit Bot

DevTools: Convert handleShortcut to Actions in the Network panel

This is part of a series of patches to remove Panel.handleShortcut

Change-Id: I9c66fa93da4ee7a1e0a12a68f09391c1c4651f7c
Reviewed-on: https://chromium-review.googlesource.com/1060513
Commit-Queue: Joel Einbinder <einbinder@chromium.org>
Reviewed-by: default avatarDmitry Gozman <dgozman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#561703}
parent 89403a1f
Showing request foo
Network Item View: true
Hiding request
Network Item View: null
// Copyright 2018 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
(async function() {
await TestRunner.showPanel('network');
var panel = UI.panels.network;
var target = panel._networkLogView;
var types = Common.resourceTypes;
var requestFoo = new SDK.NetworkRequest('', '', '', '', '');
requestFoo.setResourceType(types.XHR);
requestFoo.setRequestIdForTest('foo');
TestRunner.addResult('Showing request foo');
panel._showRequest(requestFoo);
TestRunner.addResult('Network Item View: ' + (panel._networkItemView && panel._networkItemView.isShowing()));
TestRunner.addResult('Hiding request');
eventSender.keyDown('Escape');
await TestRunner.addSnifferPromise(Network.NetworkPanel.ActionDelegate.prototype, 'handleAction')
TestRunner.addResult('Network Item View: ' + (panel._networkItemView && panel._networkItemView.isShowing()));
TestRunner.completeTest();
})();
\ No newline at end of file
...@@ -381,20 +381,6 @@ Network.NetworkPanel = class extends UI.Panel { ...@@ -381,20 +381,6 @@ Network.NetworkPanel = class extends UI.Panel {
return this._networkLogView.elementsToRestoreScrollPositionsFor(); return this._networkLogView.elementsToRestoreScrollPositionsFor();
} }
/**
* @override
* @param {!KeyboardEvent} event
*/
handleShortcut(event) {
if (this._networkItemView && event.keyCode === UI.KeyboardShortcut.Keys.Esc.code) {
this._showRequest(null);
event.handled = true;
return;
}
super.handleShortcut(event);
}
/** /**
* @override * @override
*/ */
...@@ -702,7 +688,7 @@ Network.NetworkPanel.FilmStripRecorder = class { ...@@ -702,7 +688,7 @@ Network.NetworkPanel.FilmStripRecorder = class {
/** /**
* @implements {UI.ActionDelegate} * @implements {UI.ActionDelegate}
*/ */
Network.NetworkPanel.RecordActionDelegate = class { Network.NetworkPanel.ActionDelegate = class {
/** /**
* @override * @override
* @param {!UI.Context} context * @param {!UI.Context} context
...@@ -712,8 +698,24 @@ Network.NetworkPanel.RecordActionDelegate = class { ...@@ -712,8 +698,24 @@ Network.NetworkPanel.RecordActionDelegate = class {
handleAction(context, actionId) { handleAction(context, actionId) {
const panel = UI.context.flavor(Network.NetworkPanel); const panel = UI.context.flavor(Network.NetworkPanel);
console.assert(panel && panel instanceof Network.NetworkPanel); console.assert(panel && panel instanceof Network.NetworkPanel);
panel._toggleRecording(); switch (actionId) {
return true; case 'network.toggle-recording':
panel._toggleRecording();
return true;
case 'network.hide-request-details':
if (!panel._networkItemView)
return false;
panel._showRequest(null);
return true;
case 'network.search':
const selection = UI.inspectorView.element.window().getSelection();
let queryCandidate = '';
if (selection.rangeCount)
queryCandidate = selection.toString().replace(/\r?\n.*/, '');
Network.SearchNetworkView.openSearch(queryCandidate);
return true;
}
return false;
} }
}; };
...@@ -766,30 +768,3 @@ Network.SearchNetworkView = class extends Search.SearchView { ...@@ -766,30 +768,3 @@ Network.SearchNetworkView = class extends Search.SearchView {
return new Network.NetworkSearchScope(); return new Network.NetworkSearchScope();
} }
}; };
/**
* @implements {UI.ActionDelegate}
*/
Network.NetworkPanel.SearchActionDelegate = class {
/**
* @override
* @param {!UI.Context} context
* @param {string} actionId
* @return {boolean}
*/
handleAction(context, actionId) {
this._showSearch();
return true;
}
/**
* @return {!Promise}
*/
_showSearch() {
const selection = UI.inspectorView.element.window().getSelection();
let queryCandidate = '';
if (selection.rangeCount)
queryCandidate = selection.toString().replace(/\r?\n.*/, '');
return Network.SearchNetworkView.openSearch(queryCandidate);
}
};
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
"contextTypes": [ "contextTypes": [
"Network.NetworkPanel" "Network.NetworkPanel"
], ],
"className": "Network.NetworkPanel.RecordActionDelegate", "className": "Network.NetworkPanel.ActionDelegate",
"options": [ "options": [
{ {
"value": true, "value": true,
...@@ -101,6 +101,19 @@ ...@@ -101,6 +101,19 @@
} }
] ]
}, },
{
"type": "action",
"actionId": "network.hide-request-details",
"contextTypes": [
"Network.NetworkPanel"
],
"className": "Network.NetworkPanel.ActionDelegate",
"bindings": [
{
"shortcut": "Esc"
}
]
},
{ {
"type": "view", "type": "view",
"location": "drawer-view", "location": "drawer-view",
...@@ -138,7 +151,7 @@ ...@@ -138,7 +151,7 @@
"type": "action", "type": "action",
"actionId": "network.search", "actionId": "network.search",
"title": "Search", "title": "Search",
"className": "Network.NetworkPanel.SearchActionDelegate", "className": "Network.NetworkPanel.ActionDelegate",
"contextTypes": [ "contextTypes": [
"Network.NetworkPanel" "Network.NetworkPanel"
], ],
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment