<!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>[181452] 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/181452">181452</a></dd>
<dt>Author</dt> <dd>jonowells@apple.com</dd>
<dt>Date</dt> <dd>2015-03-12 13:32:29 -0700 (Thu, 12 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Debugger sidebar should group global breakpoints together
https://bugs.webkit.org/show_bug.cgi?id=142607
Reviewed by Timothy Hatcher.
Update the DebuggerSidebarPanel class to hold global breakpoints such as "All Exceptions" in one container. This
will be the place future such breakpoints are added.
* Localizations/en.lproj/localizedStrings.js: Added string.
* UserInterface/Main.html: Small rearrangement.
* UserInterface/Views/DebuggerSidebarPanel.js: Change how exception breaking options are displayed.
(WebInspector.DebuggerSidebarPanel):
(WebInspector.DebuggerSidebarPanel.prototype._treeElementSelected):
(WebInspector.DebuggerSidebarPanel.prototype._compareTopLevelTreeElements):
* UserInterface/Views/FolderTreeElement.js: Support additional classes for icons.
* UserInterface/Views/ResourceSidebarPanel.js: Change call to FolderTreeElement constructor.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs">trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceMainhtml">trunk/Source/WebInspectorUI/UserInterface/Main.html</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDebuggerSidebarPaneljs">trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsFolderTreeElementjs">trunk/Source/WebInspectorUI/UserInterface/Views/FolderTreeElement.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsResourceSidebarPaneljs">trunk/Source/WebInspectorUI/UserInterface/Views/ResourceSidebarPanel.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (181451 => 181452)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-03-12 20:24:16 UTC (rev 181451)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-03-12 20:32:29 UTC (rev 181452)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2015-03-12 Jono Wells <jonowells@apple.com>
+
+ Web Inspector: Debugger sidebar should group global breakpoints together
+ https://bugs.webkit.org/show_bug.cgi?id=142607
+
+ Reviewed by Timothy Hatcher.
+
+ Update the DebuggerSidebarPanel class to hold global breakpoints such as "All Exceptions" in one container. This
+ will be the place future such breakpoints are added.
+
+ * Localizations/en.lproj/localizedStrings.js: Added string.
+ * UserInterface/Main.html: Small rearrangement.
+
+ * UserInterface/Views/DebuggerSidebarPanel.js: Change how exception breaking options are displayed.
+ (WebInspector.DebuggerSidebarPanel):
+ (WebInspector.DebuggerSidebarPanel.prototype._treeElementSelected):
+ (WebInspector.DebuggerSidebarPanel.prototype._compareTopLevelTreeElements):
+
+ * UserInterface/Views/FolderTreeElement.js: Support additional classes for icons.
+ * UserInterface/Views/ResourceSidebarPanel.js: Change call to FolderTreeElement constructor.
+
</ins><span class="cx"> 2015-03-12 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Console Errors during provisional document loads get lost with "Clear Log on Reload"
</span></span></pre></div>
<a id="trunkSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (181451 => 181452)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2015-03-12 20:24:16 UTC (rev 181451)
+++ trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2015-03-12 20:32:29 UTC (rev 181452)
</span><span class="lines">@@ -233,6 +233,7 @@
</span><span class="cx"> localizedStrings["Full URL"] = "Full URL";
</span><span class="cx"> localizedStrings["Function"] = "Function";
</span><span class="cx"> localizedStrings["Function Name Variable"] = "Function Name Variable";
</span><ins>+localizedStrings["Global Breakpoints"] = "Global Breakpoints";
</ins><span class="cx"> localizedStrings["Global Variables"] = "Global Variables";
</span><span class="cx"> localizedStrings["Grammar"] = "Grammar";
</span><span class="cx"> localizedStrings["HTML Attributes"] = "HTML Attributes";
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceMainhtml"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Main.html (181451 => 181452)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Main.html 2015-03-12 20:24:16 UTC (rev 181451)
+++ trunk/Source/WebInspectorUI/UserInterface/Main.html 2015-03-12 20:32:29 UTC (rev 181452)
</span><span class="lines">@@ -318,6 +318,7 @@
</span><span class="cx">
</span><span class="cx"> <script src="Views/DOMDetailsSidebarPanel.js"></script>
</span><span class="cx"> <script src="Views/ObjectTreeBaseTreeElement.js"></script>
</span><ins>+ <script src="Views/FolderTreeElement.js"></script>
</ins><span class="cx"> <script src="Views/FolderizedTreeElement.js"></script>
</span><span class="cx"> <script src="Views/SourceCodeTreeElement.js"></script>
</span><span class="cx"> <script src="Views/StorageTreeElement.js"></script>
</span><span class="lines">@@ -391,7 +392,6 @@
</span><span class="cx"> <script src="Views/FilterBar.js"></script>
</span><span class="cx"> <script src="Views/FindBanner.js"></script>
</span><span class="cx"> <script src="Views/FlexibleSpaceNavigationItem.js"></script>
</span><del>- <script src="Views/FolderTreeElement.js"></script>
</del><span class="cx"> <script src="Views/FontResourceContentView.js"></script>
</span><span class="cx"> <script src="Views/FormattedValue.js"></script>
</span><span class="cx"> <script src="Views/FrameContentView.js"></script>
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDebuggerSidebarPaneljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js (181451 => 181452)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js 2015-03-12 20:24:16 UTC (rev 181451)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js 2015-03-12 20:32:29 UTC (rev 181452)
</span><span class="lines">@@ -104,6 +104,7 @@
</span><span class="cx"> // Add this offset-sections class name so the sticky headers don't overlap the navigation bar.
</span><span class="cx"> this.element.classList.add(WebInspector.DebuggerSidebarPanel.OffsetSectionsStyleClassName);
</span><span class="cx">
</span><ins>+ this._globalBreakpointsFolderTreeElement = new WebInspector.FolderTreeElement(WebInspector.UIString("Global Breakpoints"), null, WebInspector.DebuggerSidebarPanel.GlobalIconStyleClassName);
</ins><span class="cx"> this._allExceptionsBreakpointTreeElement = new WebInspector.BreakpointTreeElement(WebInspector.debuggerManager.allExceptionsBreakpoint, WebInspector.DebuggerSidebarPanel.ExceptionIconStyleClassName, WebInspector.UIString("All Exceptions"));
</span><span class="cx"> this._allUncaughtExceptionsBreakpointTreeElement = new WebInspector.BreakpointTreeElement(WebInspector.debuggerManager.allUncaughtExceptionsBreakpoint, WebInspector.DebuggerSidebarPanel.ExceptionIconStyleClassName, WebInspector.UIString("All Uncaught Exceptions"));
</span><span class="cx">
</span><span class="lines">@@ -114,8 +115,10 @@
</span><span class="cx"> this._breakpointsContentTreeOutline.ondelete = this._breakpointTreeOutlineDeleteTreeElement.bind(this);
</span><span class="cx"> this._breakpointsContentTreeOutline.oncontextmenu = this._breakpointTreeOutlineContextMenuTreeElement.bind(this);
</span><span class="cx">
</span><del>- this._breakpointsContentTreeOutline.appendChild(this._allExceptionsBreakpointTreeElement);
- this._breakpointsContentTreeOutline.appendChild(this._allUncaughtExceptionsBreakpointTreeElement);
</del><ins>+ this._breakpointsContentTreeOutline.appendChild(this._globalBreakpointsFolderTreeElement);
+ this._globalBreakpointsFolderTreeElement.appendChild(this._allExceptionsBreakpointTreeElement);
+ this._globalBreakpointsFolderTreeElement.appendChild(this._allUncaughtExceptionsBreakpointTreeElement);
+ this._globalBreakpointsFolderTreeElement.expand();
</ins><span class="cx">
</span><span class="cx"> var breakpointsRow = new WebInspector.DetailsSectionRow;
</span><span class="cx"> breakpointsRow.element.appendChild(this._breakpointsContentTreeOutline.element);
</span><span class="lines">@@ -147,6 +150,7 @@
</span><span class="cx"> WebInspector.DebuggerSidebarPanel.OffsetSectionsStyleClassName = "offset-sections";
</span><span class="cx"> WebInspector.DebuggerSidebarPanel.ExceptionIconStyleClassName = "breakpoint-exception-icon";
</span><span class="cx"> WebInspector.DebuggerSidebarPanel.PausedBreakpointIconStyleClassName = "breakpoint-paused-icon";
</span><ins>+WebInspector.DebuggerSidebarPanel.GlobalIconStyleClassName = "global-breakpoints-icon";
</ins><span class="cx">
</span><span class="cx"> WebInspector.DebuggerSidebarPanel.SelectedAllExceptionsCookieKey = "debugger-sidebar-panel-all-exceptions-breakpoint";
</span><span class="cx"> WebInspector.DebuggerSidebarPanel.SelectedAllUncaughtExceptionsCookieKey = "debugger-sidebar-panel-all-uncaught-exceptions-breakpoint";
</span><span class="lines">@@ -524,7 +528,7 @@
</span><span class="cx">
</span><span class="cx"> _breakpointTreeOutlineContextMenuTreeElement: function(event, treeElement)
</span><span class="cx"> {
</span><del>- console.assert(treeElement instanceof WebInspector.ResourceTreeElement || treeElement instanceof WebInspector.ScriptTreeElement);
</del><ins>+ console.assert(treeElement instanceof WebInspector.ResourceTreeElement || treeElement instanceof WebInspector.ScriptTreeElement || treeElement.constructor === WebInspector.FolderTreeElement);
</ins><span class="cx"> if (!(treeElement instanceof WebInspector.ResourceTreeElement) && !(treeElement instanceof WebInspector.ScriptTreeElement))
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -600,7 +604,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (!(treeElement instanceof WebInspector.BreakpointTreeElement))
</del><ins>+ if (!(treeElement instanceof WebInspector.BreakpointTreeElement) || treeElement.parent.constructor === WebInspector.FolderTreeElement)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // Deselect any other tree elements to prevent two selections in the sidebar.
</span><span class="lines">@@ -629,16 +633,11 @@
</span><span class="cx">
</span><span class="cx"> _compareTopLevelTreeElements: function(a, b)
</span><span class="cx"> {
</span><del>- if (a === this._allExceptionsBreakpointTreeElement)
</del><ins>+ if (a === this._globalBreakpointsFolderTreeElement)
</ins><span class="cx"> return -1;
</span><del>- if (b === this._allExceptionsBreakpointTreeElement)
</del><ins>+ if (b === this._globalBreakpointsFolderTreeElement)
</ins><span class="cx"> return 1;
</span><span class="cx">
</span><del>- if (a === this._allUncaughtExceptionsBreakpointTreeElement)
- return -1;
- if (b === this._allUncaughtExceptionsBreakpointTreeElement)
- return 1;
-
</del><span class="cx"> return a.mainTitle.localeCompare(b.mainTitle);
</span><span class="cx"> },
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsFolderTreeElementjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/FolderTreeElement.js (181451 => 181452)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/FolderTreeElement.js 2015-03-12 20:24:16 UTC (rev 181451)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/FolderTreeElement.js 2015-03-12 20:32:29 UTC (rev 181452)
</span><span class="lines">@@ -23,17 +23,27 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.FolderTreeElement = function(title, subtitle, representedObject)
</del><ins>+WebInspector.FolderTreeElement = function(title, subtitle, additionalClassNames, representedObject)
</ins><span class="cx"> {
</span><del>- WebInspector.GeneralTreeElement.call(this, WebInspector.FolderTreeElement.FolderIconStyleClassName, title, subtitle, representedObject, true);
</del><ins>+ var classNames;
+ if (!additionalClassNames)
+ classNames = [];
+ else if (additionalClassNames.constructor === Array)
+ classNames = additionalClassNames;
+ else if (typeof additionalClassNames === "string")
+ classNames = [additionalClassNames];
</ins><span class="cx">
</span><ins>+ classNames.unshift(WebInspector.FolderTreeElement.FolderIconStyleClassName);
+
+ WebInspector.GeneralTreeElement.call(this, classNames, title, subtitle, representedObject, true);
+
</ins><span class="cx"> this.small = true;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WebInspector.FolderTreeElement.FolderIconStyleClassName = "folder-icon";
</span><span class="cx">
</span><span class="cx"> WebInspector.FolderTreeElement.prototype = {
</span><del>- constructor: WebInspector.FolderTreeElement,
</del><ins>+ constructor: WebInspector.FolderTreeElement
</ins><span class="cx">
</span><span class="cx"> // No Methods or Properties
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsResourceSidebarPaneljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ResourceSidebarPanel.js (181451 => 181452)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ResourceSidebarPanel.js 2015-03-12 20:24:16 UTC (rev 181451)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ResourceSidebarPanel.js 2015-03-12 20:32:29 UTC (rev 181452)
</span><span class="lines">@@ -910,7 +910,7 @@
</span><span class="cx"> previousOnlyChild.flattened = false;
</span><span class="cx"> this._resourcesContentTreeOutline.removeChild(previousOnlyChild);
</span><span class="cx">
</span><del>- var folderElement = new WebInspector.FolderTreeElement(folderName, null, null);
</del><ins>+ var folderElement = new WebInspector.FolderTreeElement(folderName);
</ins><span class="cx"> this._resourcesContentTreeOutline.insertChild(folderElement, insertionIndexForObjectInListSortedByFunction(folderElement, this._resourcesContentTreeOutline.children, this._compareTreeElements));
</span><span class="cx">
</span><span class="cx"> folderElement.appendChild(previousOnlyChild);
</span></span></pre>
</div>
</div>
</body>
</html>