| Index: webkit/glue/devtools/js/devtools.js
|
| ===================================================================
|
| --- webkit/glue/devtools/js/devtools.js (revision 15203)
|
| +++ webkit/glue/devtools/js/devtools.js (working copy)
|
| @@ -420,9 +420,9 @@
|
| self.sourceFrame.addEventListener('syntax highlighting complete',
|
| self._syntaxHighlightingComplete, self);
|
| self.sourceFrame.syntaxHighlightJavascript();
|
| + } else {
|
| + self._sourceFrameSetupFinished();
|
| }
|
| - } else {
|
| - self._sourceFrameSetupFinished();
|
| }
|
| });
|
| return true;
|
| @@ -593,8 +593,39 @@
|
|
|
|
|
| /**
|
| + * This function overrides standard searchableViews getters to perform search
|
| + * only in the current view (other views are loaded asynchronously, no way to
|
| + * search them yet).
|
| + */
|
| +WebInspector.searchableViews_ = function() {
|
| + var views = [];
|
| + const visibleView = this.visibleView;
|
| + if (visibleView && visibleView.performSearch) {
|
| + views.push(visibleView);
|
| + }
|
| + return views;
|
| +};
|
| +
|
| +
|
| +/**
|
| * @override
|
| */
|
| +WebInspector.ResourcesPanel.prototype.__defineGetter__(
|
| + 'searchableViews',
|
| + WebInspector.searchableViews_);
|
| +
|
| +
|
| +/**
|
| + * @override
|
| + */
|
| +WebInspector.ScriptsPanel.prototype.__defineGetter__(
|
| + 'searchableViews',
|
| + WebInspector.searchableViews_);
|
| +
|
| +
|
| +/**
|
| + * @override
|
| + */
|
| WebInspector.Console.prototype._evalInInspectedWindow = function(expression) {
|
| if (WebInspector.panels.scripts.paused)
|
| return WebInspector.panels.scripts.evaluateInSelectedCallFrame(expression);
|
|
|