<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[191071] trunk/Source/WebInspectorUI</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/191071">191071</a></dd>
<dt>Author</dt> <dd>joepeck@webkit.org</dd>
<dt>Date</dt> <dd>2015-10-14 14:03:05 -0700 (Wed, 14 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Console SearchBar should work more like ContentBrowser FindBanner
https://bugs.webkit.org/show_bug.cgi?id=149505
Patch by João Oliveira <hello@jxs.pt> on 2015-10-13
Reviewed by Joseph Pecoraro.
Console tab now uses findBanner, adapted LogContentView to use findBanner,
and findBanner to be more agnostic to both usecases, either as fixed, on console tab,
and hideable on other inspector tabs.
* UserInterface/Views/FindBanner.css:
(.find-banner.console-find-banner):
(.find-banner.console-findbanner input[type="search"]):
* UserInterface/Views/FindBanner.js:
(WebInspector.FindBanner):
(WebInspector.FindBanner.set targetElement.delayedWork):
(WebInspector.FindBanner.prototype.set targetElement):
(WebInspector.FindBanner.prototype.get showing):
(WebInspector.FindBanner.prototype.focus):
(WebInspector.FindBanner.prototype._clearAndBlur):
(WebInspector.FindBanner.prototype.show.delayedWork):
(WebInspector.FindBanner.prototype.show):
(WebInspector.FindBanner.prototype.hide):
(WebInspector.FindBanner.prototype.get element): Deleted.
(WebInspector.FindBanner.prototype._inputFieldSearch): Deleted.
* UserInterface/Views/LogContentView.js:
(WebInspector.LogContentView):
(WebInspector.LogContentView.prototype.get navigationItems):
(WebInspector.LogContentView.prototype.handleFindEvent):
(WebInspector.LogContentView.prototype.findBannerRevealPreviousResult):
(WebInspector.LogContentView.prototype.findBannerRevealNextResult):
(WebInspector.LogContentView.prototype._filterMessageElements):
(WebInspector.LogContentView.prototype.findBannerPerformSearch):
(WebInspector.LogContentView.prototype.findBannerSearchCleared):
(WebInspector.LogContentView.prototype.revealNextSearchResult):
(WebInspector.LogContentView.prototype.revealPreviousSearchResult):
(WebInspector.LogContentView.prototype._performSearch):
(WebInspector.LogContentView.prototype.searchBarDidActivate): Deleted.
(WebInspector.LogContentView.prototype._searchTextDidChange): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsFindBannercss">trunk/Source/WebInspectorUI/UserInterface/Views/FindBanner.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsFindBannerjs">trunk/Source/WebInspectorUI/UserInterface/Views/FindBanner.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsLogContentViewcss">trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsLogContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsMaincss">trunk/Source/WebInspectorUI/UserInterface/Views/Main.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsSearchBarcss">trunk/Source/WebInspectorUI/UserInterface/Views/SearchBar.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (191070 => 191071)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-10-14 20:52:04 UTC (rev 191070)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-10-14 21:03:05 UTC (rev 191071)
</span><span class="lines">@@ -1,3 +1,44 @@
</span><ins>+2015-10-13 João Oliveira <hello@jxs.pt>
+
+ Web Inspector: Console SearchBar should work more like ContentBrowser FindBanner
+ https://bugs.webkit.org/show_bug.cgi?id=149505
+
+ Reviewed by Joseph Pecoraro.
+
+ Console tab now uses findBanner, adapted LogContentView to use findBanner,
+ and findBanner to be more agnostic to both usecases, either as fixed, on console tab,
+ and hideable on other inspector tabs.
+
+ * UserInterface/Views/FindBanner.css:
+ (.find-banner.console-find-banner):
+ (.find-banner.console-findbanner input[type="search"]):
+ * UserInterface/Views/FindBanner.js:
+ (WebInspector.FindBanner):
+ (WebInspector.FindBanner.set targetElement.delayedWork):
+ (WebInspector.FindBanner.prototype.set targetElement):
+ (WebInspector.FindBanner.prototype.get showing):
+ (WebInspector.FindBanner.prototype.focus):
+ (WebInspector.FindBanner.prototype._clearAndBlur):
+ (WebInspector.FindBanner.prototype.show.delayedWork):
+ (WebInspector.FindBanner.prototype.show):
+ (WebInspector.FindBanner.prototype.hide):
+ (WebInspector.FindBanner.prototype.get element): Deleted.
+ (WebInspector.FindBanner.prototype._inputFieldSearch): Deleted.
+ * UserInterface/Views/LogContentView.js:
+ (WebInspector.LogContentView):
+ (WebInspector.LogContentView.prototype.get navigationItems):
+ (WebInspector.LogContentView.prototype.handleFindEvent):
+ (WebInspector.LogContentView.prototype.findBannerRevealPreviousResult):
+ (WebInspector.LogContentView.prototype.findBannerRevealNextResult):
+ (WebInspector.LogContentView.prototype._filterMessageElements):
+ (WebInspector.LogContentView.prototype.findBannerPerformSearch):
+ (WebInspector.LogContentView.prototype.findBannerSearchCleared):
+ (WebInspector.LogContentView.prototype.revealNextSearchResult):
+ (WebInspector.LogContentView.prototype.revealPreviousSearchResult):
+ (WebInspector.LogContentView.prototype._performSearch):
+ (WebInspector.LogContentView.prototype.searchBarDidActivate): Deleted.
+ (WebInspector.LogContentView.prototype._searchTextDidChange): Deleted.
+
</ins><span class="cx"> 2015-10-13 Nikita Vasilyev <nvasilyev@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r189567): Web Inspector: Clipped filter icons when debugger sidebar is narrow
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsFindBannercss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/FindBanner.css (191070 => 191071)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/FindBanner.css 2015-10-14 20:52:04 UTC (rev 191070)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/FindBanner.css 2015-10-14 21:03:05 UTC (rev 191071)
</span><span class="lines">@@ -188,3 +188,33 @@
</span><span class="cx"> margin: 0 6px;
</span><span class="cx"> line-height: 21px;
</span><span class="cx"> }
</span><ins>+
+.find-banner.console-find-banner {
+ position: relative;
+ top: auto;
+ border: 0;
+}
+
+.find-banner.console-find-banner > input[type="search"] {
+ padding-top: 0;
+ margin: 1px 6px;
+ outline: none;
+ -webkit-appearance: none;
+ border: 1px solid hsla(0, 0%, 0%, 0.35);
+ border-radius: 3px;
+ background-color: hsla(0, 0%, 100%, 0.2);
+ background-clip: padding-box;
+ height: 22px;
+}
+
+.find-banner.console-find-banner > input[type="search"]::-webkit-input-placeholder {
+ color: hsla(0, 0%, 0%, 0.35);
+}
+
+.find-banner.console-find-banner > input[type="search"]::-webkit-textfield-decoration-container {
+ margin-left: 4px;
+}
+
+.find-banner.console-find-banner > input[type="search"]:focus {
+ background-color: white;
+}
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsFindBannerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/FindBanner.js (191070 => 191071)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/FindBanner.js 2015-10-14 20:52:04 UTC (rev 191070)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/FindBanner.js 2015-10-14 21:03:05 UTC (rev 191071)
</span><span class="lines">@@ -23,26 +23,28 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.FindBanner = class FindBanner extends WebInspector.Object
</del><ins>+WebInspector.FindBanner = class FindBanner extends WebInspector.NavigationItem
</ins><span class="cx"> {
</span><del>- constructor(delegate, element)
</del><ins>+ constructor(delegate, className, fixed = false)
</ins><span class="cx"> {
</span><span class="cx"> super();
</span><span class="cx">
</span><span class="cx"> this._delegate = delegate || null;
</span><span class="cx">
</span><del>- this._element = element || document.createElement("div");
- this._element.classList.add("find-banner");
</del><ins>+ this.element.classList.add("find-banner");
</ins><span class="cx">
</span><ins>+ if (className)
+ this.element.classList.add(className);
+
</ins><span class="cx"> this._resultCountLabel = document.createElement("label");
</span><del>- this._element.appendChild(this._resultCountLabel);
</del><ins>+ this.element.appendChild(this._resultCountLabel);
</ins><span class="cx">
</span><span class="cx"> this._previousResultButton = document.createElement("button");
</span><span class="cx"> this._previousResultButton.classList.add(WebInspector.FindBanner.SegmentedButtonStyleClassName);
</span><span class="cx"> this._previousResultButton.classList.add(WebInspector.FindBanner.LeftSegmentButtonStyleClassName);
</span><span class="cx"> this._previousResultButton.disabled = true;
</span><span class="cx"> this._previousResultButton.addEventListener("click", this._previousResultButtonClicked.bind(this));
</span><del>- this._element.appendChild(this._previousResultButton);
</del><ins>+ this.element.appendChild(this._previousResultButton);
</ins><span class="cx">
</span><span class="cx"> var previousResultButtonGlyphElement = document.createElement("div");
</span><span class="cx"> previousResultButtonGlyphElement.classList.add(WebInspector.FindBanner.SegmentGlyphStyleClassName);
</span><span class="lines">@@ -53,7 +55,7 @@
</span><span class="cx"> this._nextResultButton.classList.add(WebInspector.FindBanner.RightSegmentButtonStyleClassName);
</span><span class="cx"> this._nextResultButton.disabled = true;
</span><span class="cx"> this._nextResultButton.addEventListener("click", this._nextResultButtonClicked.bind(this));
</span><del>- this._element.appendChild(this._nextResultButton);
</del><ins>+ this.element.appendChild(this._nextResultButton);
</ins><span class="cx">
</span><span class="cx"> var nextResultButtonGlyphElement = document.createElement("div");
</span><span class="cx"> nextResultButtonGlyphElement.classList.add(WebInspector.FindBanner.SegmentGlyphStyleClassName);
</span><span class="lines">@@ -68,19 +70,23 @@
</span><span class="cx"> this._inputField.addEventListener("keydown", this._inputFieldKeyDown.bind(this), false);
</span><span class="cx"> this._inputField.addEventListener("keyup", this._inputFieldKeyUp.bind(this), false);
</span><span class="cx"> this._inputField.addEventListener("search", this._inputFieldSearch.bind(this), false);
</span><del>- this._element.appendChild(this._inputField);
</del><ins>+ this.element.appendChild(this._inputField);
</ins><span class="cx">
</span><del>- this._doneButton = document.createElement("button");
- this._doneButton.textContent = WebInspector.UIString("Done");
- this._doneButton.addEventListener("click", this._doneButtonClicked.bind(this));
- this._element.appendChild(this._doneButton);
</del><ins>+ if (fixed)
+ this._clearAndBlurKeyboardShortcut = new WebInspector.KeyboardShortcut(null, WebInspector.KeyboardShortcut.Key.Escape, this._clearAndBlur.bind(this), this.element);
+ else {
+ let doneButtonElement = document.createElement("button");
+ doneButtonElement.textContent = WebInspector.UIString("Done");
+ doneButtonElement.addEventListener("click", this._doneButtonClicked.bind(this));
+ this.element.appendChild(doneButtonElement);
+ this._hideKeyboardShortcut = new WebInspector.KeyboardShortcut(null, WebInspector.KeyboardShortcut.Key.Escape, this.hide.bind(this), this.element);
+ }
</ins><span class="cx">
</span><span class="cx"> this._numberOfResults = null;
</span><span class="cx"> this._searchBackwards = false;
</span><span class="cx"> this._searchKeyPressed = false;
</span><span class="cx"> this._previousSearchValue = "";
</span><span class="cx">
</span><del>- this._hideKeyboardShortcut = new WebInspector.KeyboardShortcut(null, WebInspector.KeyboardShortcut.Key.Escape, this.hide.bind(this), this._element);
</del><span class="cx"> this._populateFindKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl, "E", this._populateSearchQueryFromSelection.bind(this));
</span><span class="cx"> this._populateFindKeyboardShortcut.implicitlyPreventsDefault = false;
</span><span class="cx"> this._findNextKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl, "G", this._nextResultButtonClicked.bind(this));
</span><span class="lines">@@ -103,11 +109,6 @@
</span><span class="cx"> this._delegate = newDelegate || null;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- get element()
- {
- return this._element;
- }
-
</del><span class="cx"> get inputField()
</span><span class="cx"> {
</span><span class="cx"> return this._inputField;
</span><span class="lines">@@ -157,7 +158,7 @@
</span><span class="cx"> function delayedWork()
</span><span class="cx"> {
</span><span class="cx"> oldTargetElement.classList.remove(WebInspector.FindBanner.NoTransitionStyleClassName);
</span><del>- this._element.classList.remove(WebInspector.FindBanner.NoTransitionStyleClassName);
</del><ins>+ this.element.classList.remove(WebInspector.FindBanner.NoTransitionStyleClassName);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (this._targetElement) {
</span><span class="lines">@@ -167,8 +168,8 @@
</span><span class="cx"> this._targetElement.classList.remove(WebInspector.FindBanner.SupportsFindBannerStyleClassName);
</span><span class="cx"> this._targetElement.classList.remove(WebInspector.FindBanner.ShowingFindBannerStyleClassName);
</span><span class="cx">
</span><del>- this._element.classList.add(WebInspector.FindBanner.NoTransitionStyleClassName);
- this._element.classList.remove(WebInspector.FindBanner.ShowingStyleClassName);
</del><ins>+ this.element.classList.add(WebInspector.FindBanner.NoTransitionStyleClassName);
+ this.element.classList.remove(WebInspector.FindBanner.ShowingStyleClassName);
</ins><span class="cx">
</span><span class="cx"> // Delay so we can remove the no transition style class after the other style changes are committed.
</span><span class="cx"> setTimeout(delayedWork.bind(this), 0);
</span><span class="lines">@@ -182,9 +183,31 @@
</span><span class="cx">
</span><span class="cx"> get showing()
</span><span class="cx"> {
</span><del>- return this._element.classList.contains(WebInspector.FindBanner.ShowingStyleClassName);
</del><ins>+ return this.element.classList.contains(WebInspector.FindBanner.ShowingStyleClassName);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ focus()
+ {
+ // FIXME: Workaround for: <https://webkit.org/b/149504> Caret missing from <input> after clearing text and calling select()
+ if (!this._inputField.value.length)
+ this._inputField.focus();
+ else
+ this._inputField.select();
+ }
+
+ _clearAndBlur()
+ {
+ this.numberOfResults = null;
+
+ this._inputField.value = "";
+ this._previousSearchValue = "";
+
+ if (this._delegate.findBannerSearchCleared)
+ this._delegate.findBannerSearchCleared();
+ if (this._delegate.findBannerWantsToClearAndBlur)
+ this._delegate.findBannerWantsToClearAndBlur();
+ }
+
</ins><span class="cx"> show()
</span><span class="cx"> {
</span><span class="cx"> console.assert(this._targetElement);
</span><span class="lines">@@ -195,13 +218,13 @@
</span><span class="cx"> if (!this._targetElement.parentNode)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (this._element.parentNode !== this._targetElement.parentNode)
- this._targetElement.parentNode.insertBefore(this._element, this._targetElement);
</del><ins>+ if (this.element.parentNode !== this._targetElement.parentNode)
+ this._targetElement.parentNode.insertBefore(this.element, this._targetElement);
</ins><span class="cx">
</span><span class="cx"> function delayedWork()
</span><span class="cx"> {
</span><span class="cx"> this._targetElement.classList.add(WebInspector.FindBanner.ShowingFindBannerStyleClassName);
</span><del>- this._element.classList.add(WebInspector.FindBanner.ShowingStyleClassName);
</del><ins>+ this.element.classList.add(WebInspector.FindBanner.ShowingStyleClassName);
</ins><span class="cx">
</span><span class="cx"> this._inputField.select();
</span><span class="cx"> }
</span><span class="lines">@@ -222,7 +245,7 @@
</span><span class="cx"> this._inputField.blur();
</span><span class="cx">
</span><span class="cx"> this._targetElement.classList.remove(WebInspector.FindBanner.ShowingFindBannerStyleClassName);
</span><del>- this._element.classList.remove(WebInspector.FindBanner.ShowingStyleClassName);
</del><ins>+ this.element.classList.remove(WebInspector.FindBanner.ShowingStyleClassName);
</ins><span class="cx">
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.FindBanner.Event.DidHide);
</span><span class="cx"> }
</span><span class="lines">@@ -276,7 +299,6 @@
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> this.numberOfResults = null;
</span><del>-
</del><span class="cx"> if (this._delegate && typeof this._delegate.findBannerSearchCleared === "function")
</span><span class="cx"> this._delegate.findBannerSearchCleared(this);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsLogContentViewcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.css (191070 => 191071)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.css 2015-10-14 20:52:04 UTC (rev 191070)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.css 2015-10-14 21:03:05 UTC (rev 191071)
</span><span class="lines">@@ -185,12 +185,6 @@
</span><span class="cx"> display: none;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.search-bar.log-search-bar > input[type="search"] {
- width: 150px;
- border: 1px solid hsla(0, 0%, 0%, 0.35);
- padding-left: 4px;
-}
-
</del><span class="cx"> .search-in-progress .console-item.filtered-out-by-search {
</span><span class="cx"> display: none;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsLogContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js (191070 => 191071)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js 2015-10-14 20:52:04 UTC (rev 191070)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js 2015-10-14 21:03:05 UTC (rev 191071)
</span><span class="lines">@@ -57,8 +57,8 @@
</span><span class="cx"> this._logViewController = new WebInspector.JavaScriptLogViewController(this.messagesElement, this.element, this.prompt, this, "console-prompt-history");
</span><span class="cx"> this._lastMessageView = null;
</span><span class="cx">
</span><del>- this._searchBar = new WebInspector.SearchBar("log-search-bar", WebInspector.UIString("Filter Console Log"), this);
- this._searchBar.addEventListener(WebInspector.SearchBar.Event.TextChanged, this._searchTextDidChange, this);
</del><ins>+ this._findBanner = new WebInspector.FindBanner(this, "console-find-banner", true);
+ this._findBanner.inputField.placeholder = WebInspector.UIString("Filter Console Log");
</ins><span class="cx">
</span><span class="cx"> var scopeBarItems = [
</span><span class="cx"> new WebInspector.ScopeBarItem(WebInspector.LogContentView.Scopes.All, WebInspector.UIString("All"), true),
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx">
</span><span class="cx"> get navigationItems()
</span><span class="cx"> {
</span><del>- var navigationItems = [this._searchBar, this._scopeBar, this._clearLogNavigationItem];
</del><ins>+ let navigationItems = [this._findBanner, this._scopeBar, this._clearLogNavigationItem];
</ins><span class="cx"> if (WebInspector.isShowingSplitConsole())
</span><span class="cx"> navigationItems.push(this._showConsoleTabNavigationItem);
</span><span class="cx"> return navigationItems;
</span><span class="lines">@@ -188,7 +188,7 @@
</span><span class="cx"> if (!this.visible)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- this._searchBar.focus();
</del><ins>+ this._findBanner.focus();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> get supportsSave()
</span><span class="lines">@@ -217,6 +217,11 @@
</span><span class="cx"> event.preventDefault();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ findBannerRevealPreviousResult()
+ {
+ this.highlightPreviousSearchMatch();
+ }
+
</ins><span class="cx"> highlightPreviousSearchMatch()
</span><span class="cx"> {
</span><span class="cx"> if (!this.searchInProgress || isEmptyObject(this._searchMatches))
</span><span class="lines">@@ -226,6 +231,11 @@
</span><span class="cx"> this._highlightSearchMatchAtIndex(index - 1);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ findBannerRevealNextResult()
+ {
+ this.highlightNextSearchMatch();
+ }
+
</ins><span class="cx"> highlightNextSearchMatch()
</span><span class="cx"> {
</span><span class="cx"> if (!this.searchInProgress || isEmptyObject(this._searchMatches))
</span><span class="lines">@@ -235,7 +245,7 @@
</span><span class="cx"> this._highlightSearchMatchAtIndex(index);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- searchBarWantsToLoseFocus(searchBar)
</del><ins>+ findBannerWantsToClearAndBlur(findBanner)
</ins><span class="cx"> {
</span><span class="cx"> if (this._selectedMessages.length)
</span><span class="cx"> this.messagesElement.focus();
</span><span class="lines">@@ -243,13 +253,6 @@
</span><span class="cx"> this.prompt.focus();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- searchBarDidActivate(searchBar)
- {
- if (!isEmptyObject(this._searchMatches))
- this._highlightSearchMatchAtIndex(0);
- this.prompt.focus();
- }
-
</del><span class="cx"> // Private
</span><span class="cx">
</span><span class="cx"> _formatMessagesAsData(onlySelected)
</span><span class="lines">@@ -694,7 +697,7 @@
</span><span class="cx"> }
</span><span class="cx"> }, this);
</span><span class="cx">
</span><del>- this._performSearch();
</del><ins>+ this._performSearch("");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> _keyDown(event)
</span><span class="lines">@@ -849,18 +852,31 @@
</span><span class="cx"> focusableElements[i].removeAttribute("tabindex");
</span><span class="cx"> }
</span><span class="cx">
</span><del>- _searchTextDidChange(event)
</del><ins>+ findBannerPerformSearch(findBanner, searchTerms)
</ins><span class="cx"> {
</span><del>- this._performSearch();
</del><ins>+ this._performSearch(searchTerms);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- _performSearch()
</del><ins>+ findBannerSearchCleared()
</ins><span class="cx"> {
</span><ins>+ this._performSearch("");
+ }
+
+ revealNextSearchResult()
+ {
+ this.findBannerRevealNextResult();
+ }
+
+ revealPreviousSearchResult()
+ {
+ this.findBannerRevealPreviousResult();
+ }
+
+ _performSearch(searchTerms)
+ {
</ins><span class="cx"> if (!isEmptyObject(this._searchHighlightDOMChanges))
</span><span class="cx"> WebInspector.revertDomChanges(this._searchHighlightDOMChanges);
</span><span class="cx">
</span><del>- var searchTerms = this._searchBar.text;
-
</del><span class="cx"> if (searchTerms === "") {
</span><span class="cx"> delete this._selectedSearchMatch;
</span><span class="cx"> this._matchingSearchElements = [];
</span><span class="lines">@@ -873,6 +889,7 @@
</span><span class="cx"> this._searchHighlightDOMChanges = [];
</span><span class="cx"> this._searchMatches = [];
</span><span class="cx"> this._selectedSearchMathIsValid = false;
</span><ins>+ let numberOfResults = 0;
</ins><span class="cx">
</span><span class="cx"> var searchRegex = new RegExp(searchTerms.escapeForRegExp(), "gi");
</span><span class="cx"> this._unfilteredMessageElements().forEach(function(message) {
</span><span class="lines">@@ -880,6 +897,7 @@
</span><span class="cx"> var text = message.textContent;
</span><span class="cx"> var match = searchRegex.exec(text);
</span><span class="cx"> while (match) {
</span><ins>+ numberOfResults++;
</ins><span class="cx"> matchRanges.push({ offset: match.index, length: match[0].length });
</span><span class="cx"> match = searchRegex.exec(text);
</span><span class="cx"> }
</span><span class="lines">@@ -898,6 +916,8 @@
</span><span class="cx"> this._selectedSearchMatch.highlight.classList.remove(WebInspector.LogContentView.SelectedStyleClassName);
</span><span class="cx"> delete this._selectedSearchMatch;
</span><span class="cx"> }
</span><ins>+
+ this._findBanner.numberOfResults = numberOfResults;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> _highlightRanges(message, matchRanges)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsMaincss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/Main.css (191070 => 191071)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/Main.css 2015-10-14 20:52:04 UTC (rev 191070)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/Main.css 2015-10-14 21:03:05 UTC (rev 191071)
</span><span class="lines">@@ -187,11 +187,7 @@
</span><span class="cx"> display: none;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#split-content-browser > .navigation-bar > :matches(.hierarchical-path, .log-search-bar, .log-scope-bar) {
- pointer-events: none;
-}
-
-#split-content-browser > .navigation-bar > :matches(.log-search-bar, .log-scope-bar) > :matches(li, input) {
</del><ins>+#split-content-browser > .navigation-bar > .log-scope-bar > li {
</ins><span class="cx"> pointer-events: all;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsSearchBarcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/SearchBar.css (191070 => 191071)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/SearchBar.css 2015-10-14 20:52:04 UTC (rev 191070)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/SearchBar.css 2015-10-14 21:03:05 UTC (rev 191071)
</span><span class="lines">@@ -43,5 +43,6 @@
</span><span class="cx"> color: hsla(0, 0%, 0%, 0.35);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.search-bar > input[type="search"]:focus { background-color: white; }
-.search-bar > input[type="search"]:not(:placeholder-shown) { background-color: white; } /* Needs to be a separate rule. See http://webkit.org/b/118162 */
</del><ins>+.search-bar > input[type="search"]:focus {
+ background-color: white;
+}
</ins></span></pre>
</div>
</div>
</body>
</html>