<!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>[200681] branches/safari-602.1.32-branch/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/200681">200681</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2016-05-11 01:16:54 -0700 (Wed, 11 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/200608">r200608</a>. rdar://problem/26177346</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari602132branchSourceWebInspectorUIChangeLog">branches/safari-602.1.32-branch/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#branchessafari602132branchSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs">branches/safari-602.1.32-branch/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js</a></li>
<li><a href="#branchessafari602132branchSourceWebInspectorUIUserInterfaceViewsDebuggerSidebarPaneljs">branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari602132branchSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebInspectorUI/ChangeLog (200680 => 200681)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebInspectorUI/ChangeLog 2016-05-11 08:16:06 UTC (rev 200680)
+++ branches/safari-602.1.32-branch/Source/WebInspectorUI/ChangeLog 2016-05-11 08:16:54 UTC (rev 200681)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2016-05-11 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r200608.
+
+ 2016-05-09 Matt Baker <mattbaker@apple.com>
+
+ Web Inspector: Filtering by Errors/Warnings should not filter Breakpoints list
+ https://bugs.webkit.org/show_bug.cgi?id=157481
+ <rdar://problem/26177346>
+
+ Reviewed by Timothy Hatcher.
+
+ * Localizations/en.lproj/localizedStrings.js:
+ New UI strings.
+
+ * UserInterface/Views/DebuggerSidebarPanel.js:
+ (WebInspector.DebuggerSidebarPanel.showResourcesWithIssuesOnlyFilterFunction):
+ Only filter tree elements belonging to the scripts tree outline.
+ (WebInspector.DebuggerSidebarPanel):
+ Drive-by cleanup of Issues filter button tooltips.
+
+2016-05-11 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r200600.
</span><span class="cx">
</span><span class="cx"> 2016-05-09 Matt Baker <mattbaker@apple.com>
</span></span></pre></div>
<a id="branchessafari602132branchSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (200680 => 200681)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2016-05-11 08:16:06 UTC (rev 200680)
+++ branches/safari-602.1.32-branch/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2016-05-11 08:16:54 UTC (rev 200681)
</span><span class="lines">@@ -501,6 +501,7 @@
</span><span class="cx"> localizedStrings["Object Graph"] = "Object Graph";
</span><span class="cx"> localizedStrings["Offset"] = "Offset";
</span><span class="cx"> localizedStrings["Online"] = "Online";
</span><ins>+localizedStrings["Only show resources with issues"] = "Only show resources with issues";
</ins><span class="cx"> localizedStrings["Opacity"] = "Opacity";
</span><span class="cx"> localizedStrings["Option-click to show all units"] = "Option-click to show all units";
</span><span class="cx"> localizedStrings["Option-click to show all values"] = "Option-click to show all values";
</span><span class="lines">@@ -636,10 +637,9 @@
</span><span class="cx"> localizedStrings["Show Remaining (%d)"] = "Show Remaining (%d)";
</span><span class="cx"> localizedStrings["Show Replay Controls"] = "Show Replay Controls";
</span><span class="cx"> localizedStrings["Show Source"] = "Show Source";
</span><ins>+localizedStrings["Show all resources"] = "Show all resources";
</ins><span class="cx"> localizedStrings["Show compositing borders"] = "Show compositing borders";
</span><span class="cx"> localizedStrings["Show console tab"] = "Show console tab";
</span><del>-localizedStrings["Show only resources with issues."] = "Show only resources with issues.";
-localizedStrings["Show resources with and without issues."] = "Show resources with and without issues.";
</del><span class="cx"> localizedStrings["Show shadow DOM nodes"] = "Show shadow DOM nodes";
</span><span class="cx"> localizedStrings["Show the details sidebar (%s)"] = "Show the details sidebar (%s)";
</span><span class="cx"> localizedStrings["Show the navigation sidebar (%s)"] = "Show the navigation sidebar (%s)";
</span></span></pre></div>
<a id="branchessafari602132branchSourceWebInspectorUIUserInterfaceViewsDebuggerSidebarPaneljs"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js (200680 => 200681)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js 2016-05-11 08:16:06 UTC (rev 200680)
+++ branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js 2016-05-11 08:16:54 UTC (rev 200681)
</span><span class="lines">@@ -107,6 +107,10 @@
</span><span class="cx">
</span><span class="cx"> function showResourcesWithIssuesOnlyFilterFunction(treeElement)
</span><span class="cx"> {
</span><ins>+ // Issues are only shown in the scripts tree outline.
+ if (treeElement.treeOutline !== this._scriptsContentTreeOutline)
+ return true;
+
</ins><span class="cx"> // Keep issues.
</span><span class="cx"> if (treeElement instanceof WebInspector.IssueTreeElement)
</span><span class="cx"> return true;
</span><span class="lines">@@ -121,7 +125,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> };
</span><span class="cx">
</span><del>- this.filterBar.addFilterBarButton("debugger-show-resources-with-issues-only", showResourcesWithIssuesOnlyFilterFunction, true, WebInspector.UIString("Show only resources with issues."), WebInspector.UIString("Show resources with and without issues."), "Images/Errors.svg", 15, 15);
</del><ins>+ this.filterBar.addFilterBarButton("debugger-show-resources-with-issues-only", showResourcesWithIssuesOnlyFilterFunction.bind(this), true, WebInspector.UIString("Only show resources with issues"), WebInspector.UIString("Show all resources"), "Images/Errors.svg", 15, 15);
</ins><span class="cx">
</span><span class="cx"> this._breakpointsContentTreeOutline = this.contentTreeOutline;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>