Changeset 219269 in webkit


Ignore:
Timestamp:
Jul 7, 2017 2:33:26 PM (7 years ago)
Author:
Devin Rousso
Message:

Web Inspector: REGRESSION(r217258): WebSocket resource tree elements don't show the connection status
https://bugs.webkit.org/show_bug.cgi?id=174274

Reviewed by Brian Burg.

  • UserInterface/Views/FrameTreeElement.js:

(WebInspector.FrameTreeElement):

  • UserInterface/Views/ResourceTreeElement.js:

(WebInspector.ResourceTreeElement.prototype.populateContextMenu):

  • UserInterface/Views/WebSocketResourceTreeElement.js:

(WebInspector.WebSocketResourceTreeElement.prototype.populateContextMenu):
Move "Log WebSocket" context menu item to WebSocketResourceTreeElement.

Location:
trunk/Source/WebInspectorUI
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebInspectorUI/ChangeLog

    r219268 r219269  
     12017-07-07  Devin Rousso  <drousso@apple.com>
     2
     3        Web Inspector: REGRESSION(r217258): WebSocket resource tree elements don't show the connection status
     4        https://bugs.webkit.org/show_bug.cgi?id=174274
     5
     6        Reviewed by Brian Burg.
     7
     8        * UserInterface/Views/FrameTreeElement.js:
     9        (WebInspector.FrameTreeElement):
     10        * UserInterface/Views/ResourceTreeElement.js:
     11        (WebInspector.ResourceTreeElement.prototype.populateContextMenu):
     12        * UserInterface/Views/WebSocketResourceTreeElement.js:
     13        (WebInspector.WebSocketResourceTreeElement.prototype.populateContextMenu):
     14        Move "Log WebSocket" context menu item to WebSocketResourceTreeElement.
     15
    1162017-07-07  Devin Rousso  <drousso@apple.com>
    217
  • trunk/Source/WebInspectorUI/UserInterface/Views/FrameTreeElement.js

    r218544 r219269  
    7070                treeElementConstructor = WebInspector.WebSocketResourceTreeElement;
    7171
    72             this.registerFolderizeSettings(key, folderName, this._frame.resourceCollectionForType(value), forwardingConstructor);
     72            this.registerFolderizeSettings(key, folderName, this._frame.resourceCollectionForType(value), treeElementConstructor);
    7373        }
    7474
  • trunk/Source/WebInspectorUI/UserInterface/Views/ResourceTreeElement.js

    r219014 r219269  
    162162    populateContextMenu(contextMenu, event)
    163163    {
    164         if (this._resource.type === WebInspector.Resource.Type.WebSocket) {
    165             contextMenu.appendItem(WebInspector.UIString("Log WebSocket"), () => {
    166                 WebInspector.RemoteObject.resolveWebSocket(this._resource, WebInspector.RuntimeManager.ConsoleObjectGroup, (remoteObject) => {
    167                     if (!remoteObject)
    168                         return;
    169 
    170                     const text = WebInspector.UIString("Selected WebSocket");
    171                     const addSpecialUserLogClass = true;
    172                     WebInspector.consoleLogViewController.appendImmediateExecutionWithResult(text, remoteObject, addSpecialUserLogClass);
    173                 });
    174             });
    175 
    176             contextMenu.appendSeparator();
    177         }
    178 
    179164        WebInspector.appendContextMenuItemsForSourceCode(contextMenu, this._resource);
    180165
  • trunk/Source/WebInspectorUI/UserInterface/Views/WebSocketResourceTreeElement.js

    r214839 r219269  
    4444    }
    4545
     46    populateContextMenu(contextMenu, event)
     47    {
     48        contextMenu.appendItem(WebInspector.UIString("Log WebSocket"), () => {
     49            WebInspector.RemoteObject.resolveWebSocket(this._resource, WebInspector.RuntimeManager.ConsoleObjectGroup, (remoteObject) => {
     50                if (!remoteObject)
     51                    return;
     52
     53                const text = WebInspector.UIString("Selected WebSocket");
     54                const addSpecialUserLogClass = true;
     55                WebInspector.consoleLogViewController.appendImmediateExecutionWithResult(text, remoteObject, addSpecialUserLogClass);
     56            });
     57        });
     58
     59        contextMenu.appendSeparator();
     60
     61        super.populateContextMenu(contextMenu, event);
     62    }
     63
    4664    // Private
    4765
Note: See TracChangeset for help on using the changeset viewer.