Changeset 53806 in webkit


Ignore:
Timestamp:
Jan 25, 2010 8:06:45 AM (14 years ago)
Author:
pfeldman@chromium.org
Message:

2010-01-25 Pavel Feldman <pfeldman@chromium.org>

Reviewed by Timothy Hatcher.

Web Inspector: don't show headers/content tabs in scripts view.

https://bugs.webkit.org/show_bug.cgi?id=34083

  • inspector/front-end/ResourceView.js: (WebInspector.ResourceView): (WebInspector.ResourceView.prototype.set headersVisible): (WebInspector.ResourceView.prototype._selectContentTab): (WebInspector.ResourceView.prototype._innerSelectContentTab):
  • inspector/front-end/ResourcesPanel.js: (WebInspector.ResourcesPanel.prototype.show): (WebInspector.ResourcesPanel.prototype.recreateViewForResourceIfNeeded): (WebInspector.ResourcesPanel.prototype.showResource):
  • inspector/front-end/ScriptsPanel.js: (WebInspector.ScriptsPanel.prototype.show): (WebInspector.ScriptsPanel.prototype._showScriptOrResource):
  • inspector/front-end/inspector.css:
Location:
trunk/WebCore
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebCore/ChangeLog

    r53804 r53806  
     12010-01-25  Pavel Feldman  <pfeldman@chromium.org>
     2
     3        Reviewed by Timothy Hatcher.
     4
     5        Web Inspector: don't show headers/content tabs in scripts view.
     6
     7        https://bugs.webkit.org/show_bug.cgi?id=34083
     8
     9        * inspector/front-end/ResourceView.js:
     10        (WebInspector.ResourceView):
     11        (WebInspector.ResourceView.prototype.set headersVisible):
     12        (WebInspector.ResourceView.prototype._selectContentTab):
     13        (WebInspector.ResourceView.prototype._innerSelectContentTab):
     14        * inspector/front-end/ResourcesPanel.js:
     15        (WebInspector.ResourcesPanel.prototype.show):
     16        (WebInspector.ResourcesPanel.prototype.recreateViewForResourceIfNeeded):
     17        (WebInspector.ResourcesPanel.prototype.showResource):
     18        * inspector/front-end/ScriptsPanel.js:
     19        (WebInspector.ScriptsPanel.prototype.show):
     20        (WebInspector.ScriptsPanel.prototype._showScriptOrResource):
     21        * inspector/front-end/inspector.css:
     22
    1232010-01-25  Simon Hausmann  <hausmann@webkit.org>
    224
  • trunk/WebCore/inspector/front-end/ResourceView.js

    r53794 r53806  
    108108    this.headersTreeOutline.appendChild(this.responseHeadersTreeElement);
    109109
     110    this.headersVisible = true;
     111
    110112    resource.addEventListener("url changed", this._refreshURL, this);
    111113    resource.addEventListener("requestHeaders changed", this._refreshRequestHeaders, this);
     
    130132    },
    131133
    132     show: function(parentElement)
    133     {
    134         WebInspector.View.prototype.show.call(this, parentElement);
    135         this._selectTab();
     134    set headersVisible(x)
     135    {
     136        if (x === this._headersVisible)
     137            return;
     138        this._headersVisible = x;
     139        if (x) {
     140            this.element.addStyleClass("headers-visible");
     141            this._selectTab();
     142        } else {
     143            this.element.removeStyleClass("headers-visible");
     144            this._innerSelectContentTab();
     145        }
    136146    },
    137147
     
    156166    {
    157167        WebInspector.settings.resourceViewTab = "content";
     168        this._innerSelectContentTab();
     169    },
     170
     171    _innerSelectContentTab: function()
     172    {
    158173        this.contentTabElement.addStyleClass("selected");
    159174        this.headersTabElement.removeStyleClass("selected");
  • trunk/WebCore/inspector/front-end/ResourcesPanel.js

    r53794 r53806  
    193193
    194194        var visibleView = this.visibleView;
    195         if (this.visibleResource)
    196             visibleView.show(this.viewsContainerElement);
    197         else if (visibleView)
     195        if (this.visibleResource) {
     196            this.visibleView.headersVisible = true;
     197            this.visibleView.show(this.viewsContainerElement);
     198        } else if (visibleView)
    198199            visibleView.show();
    199200
     
    445446        resource._resourcesView = newView;
    446447
     448        newView.headersVisible = oldView.headersVisible;
     449
    447450        if (oldView.visible && oldView.element.parentNode)
    448451            newView.show(oldView.element.parentNode);
     
    470473
    471474        var view = this.resourceViewForResource(resource);
     475        view.headersVisible = true;
    472476        view.show(this.viewsContainerElement);
    473477
  • trunk/WebCore/inspector/front-end/ScriptsPanel.js

    r53794 r53806  
    230230        this.sidebarResizeElement.style.right = (this.sidebarElement.offsetWidth - 3) + "px";
    231231
    232         if (this.visibleView)
     232        if (this.visibleView) {
     233            if (this.visibleView instanceof WebInspector.ResourceView)
     234                this.visibleView.headersVisible = false;
    233235            this.visibleView.show(this.viewsContainerElement);
    234 
     236        }
    235237        // Hide any views that are visible that are not this panel's current visible view.
    236238        // This can happen when a ResourceView is visible in the Resources panel then switched
     
    609611                return null;
    610612            view = WebInspector.panels.resources.resourceViewForResource(scriptOrResource);
     613            view.headersVisible = false;
    611614
    612615            if (scriptOrResource.url in this._breakpointsURLMap) {
  • trunk/WebCore/inspector/front-end/inspector.css

    r53795 r53806  
    780780
    781781.resource-view .scope-bar {
     782    display: none;
    782783    position: absolute;
    783784    height: 20px;
     
    787788    background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(rgb(236, 236, 236)), to(rgb(217, 217, 217)));
    788789    border-bottom: 1px solid rgb(163, 163, 163);
     790}
     791
     792.resource-view.headers-visible .scope-bar {
     793    display: block;
    789794}
    790795
     
    798803    -webkit-user-select: text;   
    799804    position: absolute;
     805    top: 0;
     806    left: 0;
     807    right: 0;
     808    bottom: 0;
     809    overflow: auto;
     810}
     811
     812.resource-view.headers-visible .resource-view-headers {
    800813    top: 20px;
    801     left: 0;
    802     right: 0;
    803     bottom: 0;
    804     overflow: auto;
    805814}
    806815
     
    841850.resource-view .resource-view-content {
    842851    position: absolute;
     852    top: 0;
     853    right: 0;
     854    left: 0;
     855    bottom: 0;
     856}
     857
     858.resource-view.headers-visible .resource-view-content {
    843859    top: 20px;
    844     right: 0;
    845     left: 0;
    846     bottom: 0;
    847860}
    848861
     
    24442457#script-resource-views {
    24452458    display: block;
    2446     overflow: auto;
    24472459    padding: 0;
    24482460    position: absolute;
Note: See TracChangeset for help on using the changeset viewer.