Changeset 82830 in webkit


Ignore:
Timestamp:
Apr 4, 2011 7:17:40 AM (13 years ago)
Author:
podivilov@chromium.org
Message:

2011-04-04 Pavel Podivilov <​podivilov@chromium.org>

Reviewed by Yury Semikhatsky.

Web Inspector: search in resources panel is broken.
​https://bugs.webkit.org/show_bug.cgi?id=57631

Search in resources panel should trigger source frame content load.

  • inspector/front-end/Panel.js: (WebInspector.Panel.prototype.jumpToNextSearchResult): (WebInspector.Panel.prototype.jumpToPreviousSearchResult):
  • inspector/front-end/ResourcesPanel.js:
  • inspector/front-end/SearchController.js: (WebInspector.SearchController.prototype.handleShortcut): (WebInspector.SearchController.prototype.focusSearchField):
  • inspector/front-end/SourceFrame.js: (WebInspector.SourceFrame.prototype.show): (WebInspector.SourceFrame.prototype._ensureContentLoaded): (WebInspector.SourceFrame.prototype.performSearch):
Location:
trunk/Source/WebCore
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r82828 r82830  
     12011-04-04  Pavel Podivilov  <podivilov@chromium.org>
     2
     3        Reviewed by Yury Semikhatsky.
     4
     5        Web Inspector: search in resources panel is broken.
     6        https://bugs.webkit.org/show_bug.cgi?id=57631
     7
     8        Search in resources panel should trigger source frame content load.
     9
     10        * inspector/front-end/Panel.js:
     11        (WebInspector.Panel.prototype.jumpToNextSearchResult):
     12        (WebInspector.Panel.prototype.jumpToPreviousSearchResult):
     13        * inspector/front-end/ResourcesPanel.js:
     14        * inspector/front-end/SearchController.js:
     15        (WebInspector.SearchController.prototype.handleShortcut):
     16        (WebInspector.SearchController.prototype.focusSearchField):
     17        * inspector/front-end/SourceFrame.js:
     18        (WebInspector.SourceFrame.prototype.show):
     19        (WebInspector.SourceFrame.prototype._ensureContentLoaded):
     20        (WebInspector.SourceFrame.prototype.performSearch):
     21
    1222011-04-03  Eric Seidel  <eric@webkit.org>
    223

  • trunk/Source/WebCore/inspector/front-end/Panel.js

    r82685 r82830  
    236236        if (currentView !== this.visibleView) {
    237237            this.showView(currentView);
    238             WebInspector.focusSearchField();
     238            WebInspector.searchController.focusSearchField();
    239239        }
    240240
    … …  
    269269        if (currentView !== this.visibleView) {
    270270            this.showView(currentView);
    271             WebInspector.focusSearchField();
     271            WebInspector.searchController.focusSearchField();
    272272        }
    273273

  • trunk/Source/WebCore/inspector/front-end/ResourcesPanel.js

    r82685 r82830  
    694694
    695695        const visibleView = this.visibleView;
    696         if (visibleView.performSearch)
     696        if (visibleView && visibleView.performSearch)
    697697            views.push(visibleView);
    698698

  • trunk/Source/WebCore/inspector/front-end/SearchController.js

    r80102 r82830  
    8585
    8686                if (isFindKey) {
    87                     this._focusSearchField();
     87                    this.focusSearchField();
    8888                    event.handled = true;
    8989                }
    … …  
    9393            case "F3":
    9494                if (!isMac) {
    95                     this._focusSearchField();
     95                    this.focusSearchField();
    9696                    event.handled = true;
    9797                }
    … …  
    158158    },
    159159
    160     _focusSearchField: function()
     160    focusSearchField: function()
    161161    {
    162162        this.element.focus();

  • trunk/Source/WebCore/inspector/front-end/SourceFrame.js

    r82808 r82830  
    6464        WebInspector.View.prototype.show.call(this, parentElement);
    6565
    66         if (!this._contentRequested) {
    67             this._contentRequested = true;
    68             this._delegate.requestContent(this._createTextViewer.bind(this));
    69         }
     66        this._ensureContentLoaded();
    7067
    7168        if (this._textViewer) {
    … …  
    10097    {
    10198        return true;
     99    },
     100
     101    _ensureContentLoaded: function()
     102    {
     103        if (!this._contentRequested) {
     104            this._contentRequested = true;
     105            this._delegate.requestContent(this._createTextViewer.bind(this));
     106        }
    102107    },
    103108
    … …  
    347352            this._delayedFindSearchMatches = doFindSearchMatches.bind(this, query);
    348353
     354        this._ensureContentLoaded();
    349355    },
    350356
Note: See TracChangeset for help on using the changeset viewer.