Changeset 183671 in webkit


Ignore:
Timestamp:
May 1, 2015, 7:24:17 AM (10 years ago)
Author:
timothy@apple.com
Message:

Web Inspector: Remove FrameContentView.js
​https://bugs.webkit.org/show_bug.cgi?id=144415

Reviewed by Joseph Pecoraro.

  • UserInterface/Images/DOMTree.svg: Removed.
  • UserInterface/Images/SourceCode.svg: Removed.
  • UserInterface/Main.html: Removed FrameContentView.js.
  • UserInterface/Views/FrameContentView.js: Removed.
  • UserInterface/Views/PathComponentIcons.css:

(.source-code-icon .icon): Deleted.
(.dom-tree-icon .icon): Deleted.

  • UserInterface/Views/ResourceSidebarPanel.js:

(WebInspector.ResourceSidebarPanel.prototype._mainFrameMainResourceDidChange.delayedWork):
(WebInspector.ResourceSidebarPanel.prototype._mainFrameMainResourceDidChange):
Simplify the code here. We don't need these checks now with tabs and the Storage tab.

Location:
trunk/Source/WebInspectorUI
Files:
5 deleted
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebInspectorUI/ChangeLog

    r183668 r183671  
     12015-04-29  Timothy Hatcher  <timothy@apple.com>
     2
     3        Web Inspector: Remove FrameContentView.js
     4        https://bugs.webkit.org/show_bug.cgi?id=144415
     5
     6        Reviewed by Joseph Pecoraro.
     7
     8        * UserInterface/Images/DOMTree.svg: Removed.
     9        * UserInterface/Images/SourceCode.svg: Removed.
     10        * UserInterface/Main.html: Removed FrameContentView.js.
     11        * UserInterface/Views/FrameContentView.js: Removed.
     12        * UserInterface/Views/PathComponentIcons.css:
     13        (.source-code-icon .icon): Deleted.
     14        (.dom-tree-icon .icon): Deleted.
     15
     16        * UserInterface/Views/ResourceSidebarPanel.js:
     17        (WebInspector.ResourceSidebarPanel.prototype._mainFrameMainResourceDidChange.delayedWork):
     18        (WebInspector.ResourceSidebarPanel.prototype._mainFrameMainResourceDidChange):
     19        Simplify the code here. We don't need these checks now with tabs and the Storage tab.
     20
    1212015-04-30  Nikita Vasilyev  <nvasilyev@apple.com>
    222

  • trunk/Source/WebInspectorUI/UserInterface/Main.html

    r183580 r183671  
    427427    <script src="Views/FontResourceContentView.js"></script>
    428428    <script src="Views/FormattedValue.js"></script>
    429     <script src="Views/FrameContentView.js"></script>
    430429    <script src="Views/FrameDOMTreeContentView.js"></script>
    431430    <script src="Views/FrameTreeElement.js"></script>

  • trunk/Source/WebInspectorUI/UserInterface/Views/PathComponentIcons.css

    r164543 r183671  
    2323 * THE POSSIBILITY OF SUCH DAMAGE.
    2424 */
    25 
    26 .source-code-icon .icon {
    27     content: url(../Images/SourceCode.svg);
    28 }
    29 
    30 .dom-tree-icon .icon {
    31     content: url(../Images/DOMTree.svg);
    32 }
    3325
    3426.request-icon .icon {

  • trunk/Source/WebInspectorUI/UserInterface/Views/ResourceSidebarPanel.js

    r183580 r183671  
    180180    _mainFrameMainResourceDidChange(event)
    181181    {
    182         var wasShowingResourceSidebar = this.selected;
    183         var currentContentView = this.contentBrowser.currentContentView;
    184         var wasShowingResourceContentView = currentContentView instanceof WebInspector.ResourceContentView
    185             || currentContentView instanceof WebInspector.ResourceClusterContentView
    186             || currentContentView instanceof WebInspector.FrameContentView
    187             || currentContentView instanceof WebInspector.ScriptContentView;
    188 
    189182        this.contentBrowser.contentViewContainer.closeAllContentViews();
    190183
    191184        function delayedWork()
    192185        {
    193             // Show the main frame since there is no content view showing or we were showing a resource before.
     186            // Show the main frame since there is no content view showing.
    194187            // Cookie restoration will attempt to re-select the resource we were showing.
    195             if (!this.contentBrowser.currentContentView || wasShowingResourceContentView) {
     188            if (!this.contentBrowser.currentContentView) {
    196189                // NOTE: This selection, during provisional loading, won't be saved, so it is
    197190                // safe to do and not-clobber cookie restoration.
Note: See TracChangeset for help on using the changeset viewer.