| Index: third_party/WebKit/Source/devtools/front_end/network/NetworkItemView.js
|
| diff --git a/third_party/WebKit/Source/devtools/front_end/network/NetworkItemView.js b/third_party/WebKit/Source/devtools/front_end/network/NetworkItemView.js
|
| index 34b8501bf4afbc5a1ef1b06a2b8f0efb705345d6..30de32f75ecd8527e3e3540bb3776c51d714e66e 100644
|
| --- a/third_party/WebKit/Source/devtools/front_end/network/NetworkItemView.js
|
| +++ b/third_party/WebKit/Source/devtools/front_end/network/NetworkItemView.js
|
| @@ -27,125 +27,119 @@
|
| * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
| * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| */
|
| -
|
| /**
|
| - * @constructor
|
| - * @extends {WebInspector.TabbedPane}
|
| - * @param {!WebInspector.NetworkRequest} request
|
| - * @param {!WebInspector.NetworkTimeCalculator} calculator
|
| + * @unrestricted
|
| */
|
| -WebInspector.NetworkItemView = function(request, calculator)
|
| -{
|
| - WebInspector.TabbedPane.call(this);
|
| +WebInspector.NetworkItemView = class extends WebInspector.TabbedPane {
|
| + /**
|
| + * @param {!WebInspector.NetworkRequest} request
|
| + * @param {!WebInspector.NetworkTimeCalculator} calculator
|
| + */
|
| + constructor(request, calculator) {
|
| + super();
|
| this.renderWithNoHeaderBackground();
|
| - this.element.classList.add("network-item-view");
|
| + this.element.classList.add('network-item-view');
|
|
|
| - this._resourceViewTabSetting = WebInspector.settings.createSetting("resourceViewTab", "preview");
|
| + this._resourceViewTabSetting = WebInspector.settings.createSetting('resourceViewTab', 'preview');
|
|
|
| var headersView = new WebInspector.RequestHeadersView(request);
|
| - this.appendTab("headers", WebInspector.UIString("Headers"), headersView);
|
| + this.appendTab('headers', WebInspector.UIString('Headers'), headersView);
|
|
|
| this.addEventListener(WebInspector.TabbedPane.Events.TabSelected, this._tabSelected, this);
|
|
|
| if (request.resourceType() === WebInspector.resourceTypes.WebSocket) {
|
| - var frameView = new WebInspector.ResourceWebSocketFrameView(request);
|
| - this.appendTab("webSocketFrames", WebInspector.UIString("Frames"), frameView);
|
| - } else if (request.mimeType === "text/event-stream") {
|
| - this.appendTab("eventSource", WebInspector.UIString("EventStream"), new WebInspector.EventSourceMessagesView(request));
|
| + var frameView = new WebInspector.ResourceWebSocketFrameView(request);
|
| + this.appendTab('webSocketFrames', WebInspector.UIString('Frames'), frameView);
|
| + } else if (request.mimeType === 'text/event-stream') {
|
| + this.appendTab(
|
| + 'eventSource', WebInspector.UIString('EventStream'), new WebInspector.EventSourceMessagesView(request));
|
| } else {
|
| - var responseView = new WebInspector.RequestResponseView(request);
|
| - var previewView = new WebInspector.RequestPreviewView(request, responseView);
|
| - this.appendTab("preview", WebInspector.UIString("Preview"), previewView);
|
| - this.appendTab("response", WebInspector.UIString("Response"), responseView);
|
| + var responseView = new WebInspector.RequestResponseView(request);
|
| + var previewView = new WebInspector.RequestPreviewView(request, responseView);
|
| + this.appendTab('preview', WebInspector.UIString('Preview'), previewView);
|
| + this.appendTab('response', WebInspector.UIString('Response'), responseView);
|
| }
|
|
|
| if (request.requestCookies || request.responseCookies) {
|
| - this._cookiesView = new WebInspector.RequestCookiesView(request);
|
| - this.appendTab("cookies", WebInspector.UIString("Cookies"), this._cookiesView);
|
| + this._cookiesView = new WebInspector.RequestCookiesView(request);
|
| + this.appendTab('cookies', WebInspector.UIString('Cookies'), this._cookiesView);
|
| }
|
|
|
| - this.appendTab("timing", WebInspector.UIString("Timing"), new WebInspector.RequestTimingView(request, calculator));
|
| + this.appendTab('timing', WebInspector.UIString('Timing'), new WebInspector.RequestTimingView(request, calculator));
|
|
|
| this._request = request;
|
| + }
|
| +
|
| + /**
|
| + * @override
|
| + */
|
| + wasShown() {
|
| + super.wasShown();
|
| + this._selectTab();
|
| + }
|
| +
|
| + /**
|
| + * @param {string=} tabId
|
| + */
|
| + _selectTab(tabId) {
|
| + if (!tabId)
|
| + tabId = this._resourceViewTabSetting.get();
|
| +
|
| + if (!this.selectTab(tabId))
|
| + this.selectTab('headers');
|
| + }
|
| +
|
| + _tabSelected(event) {
|
| + if (!event.data.isUserGesture)
|
| + return;
|
| +
|
| + this._resourceViewTabSetting.set(event.data.tabId);
|
| + }
|
| +
|
| + /**
|
| + * @return {!WebInspector.NetworkRequest}
|
| + */
|
| + request() {
|
| + return this._request;
|
| + }
|
| };
|
|
|
| -WebInspector.NetworkItemView.prototype = {
|
| - wasShown: function()
|
| - {
|
| - WebInspector.TabbedPane.prototype.wasShown.call(this);
|
| - this._selectTab();
|
| - },
|
| +/**
|
| + * @unrestricted
|
| + */
|
| +WebInspector.RequestContentView = class extends WebInspector.RequestView {
|
| + /**
|
| + * @param {!WebInspector.NetworkRequest} request
|
| + */
|
| + constructor(request) {
|
| + super(request);
|
| + }
|
| +
|
| + /**
|
| + * @override
|
| + */
|
| + wasShown() {
|
| + this._ensureInnerViewShown();
|
| + }
|
| +
|
| + _ensureInnerViewShown() {
|
| + if (this._innerViewShowRequested)
|
| + return;
|
| + this._innerViewShowRequested = true;
|
|
|
| /**
|
| - * @param {string=} tabId
|
| + * @param {?string} content
|
| + * @this {WebInspector.RequestContentView}
|
| */
|
| - _selectTab: function(tabId)
|
| - {
|
| - if (!tabId)
|
| - tabId = this._resourceViewTabSetting.get();
|
| -
|
| - if (!this.selectTab(tabId))
|
| - this.selectTab("headers");
|
| - },
|
| -
|
| - _tabSelected: function(event)
|
| - {
|
| - if (!event.data.isUserGesture)
|
| - return;
|
| -
|
| - this._resourceViewTabSetting.set(event.data.tabId);
|
| - },
|
| -
|
| - /**
|
| - * @return {!WebInspector.NetworkRequest}
|
| - */
|
| - request: function()
|
| - {
|
| - return this._request;
|
| - },
|
| -
|
| - __proto__: WebInspector.TabbedPane.prototype
|
| -};
|
| + function callback(content) {
|
| + this._innerViewShowRequested = false;
|
| + this.contentLoaded();
|
| + }
|
|
|
| -/**
|
| - * @constructor
|
| - * @extends {WebInspector.RequestView}
|
| - * @param {!WebInspector.NetworkRequest} request
|
| - */
|
| -WebInspector.RequestContentView = function(request)
|
| -{
|
| - WebInspector.RequestView.call(this, request);
|
| -};
|
| + this.request.requestContent().then(callback.bind(this));
|
| + }
|
|
|
| -WebInspector.RequestContentView.prototype = {
|
| - wasShown: function()
|
| - {
|
| - this._ensureInnerViewShown();
|
| - },
|
| -
|
| - _ensureInnerViewShown: function()
|
| - {
|
| - if (this._innerViewShowRequested)
|
| - return;
|
| - this._innerViewShowRequested = true;
|
| -
|
| - /**
|
| - * @param {?string} content
|
| - * @this {WebInspector.RequestContentView}
|
| - */
|
| - function callback(content)
|
| - {
|
| - this._innerViewShowRequested = false;
|
| - this.contentLoaded();
|
| - }
|
| -
|
| - this.request.requestContent().then(callback.bind(this));
|
| - },
|
| -
|
| - contentLoaded: function()
|
| - {
|
| - // Should be implemented by subclasses.
|
| - },
|
| -
|
| - __proto__: WebInspector.RequestView.prototype
|
| + contentLoaded() {
|
| + // Should be implemented by subclasses.
|
| + }
|
| };
|
|
|