<!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>[151688] 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/151688">151688</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2013-06-18 12:38:01 -0700 (Tue, 18 Jun 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>If the tree outline is processing a selection currently, then don't change the selection.

This is needed to allow breakpoints tree elements to be selected without jumping back to
selecting the resource tree element.

https://bugs.webkit.org/show_bug.cgi?id=117746

Reviewed by Joseph Pecoraro.

* UserInterface/Main.js:
(WebInspector._revealAndSelectRepresentedObjectInNavigationSidebar):
* UserInterface/TreeOutline.js:
(TreeElement.prototype.select):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceMainjs">trunk/Source/WebInspectorUI/UserInterface/Main.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceTreeOutlinejs">trunk/Source/WebInspectorUI/UserInterface/TreeOutline.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (151687 => 151688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog        2013-06-18 18:49:28 UTC (rev 151687)
+++ trunk/Source/WebInspectorUI/ChangeLog        2013-06-18 19:38:01 UTC (rev 151688)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2013-06-18  Timothy Hatcher  &lt;timothy@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        If the tree outline is processing a selection currently, then don't change the selection.
+
+        This is needed to allow breakpoints tree elements to be selected without jumping back to
+        selecting the resource tree element.
+
+        https://bugs.webkit.org/show_bug.cgi?id=117746
+
+        Reviewed by Joseph Pecoraro.
+
+        * UserInterface/Main.js:
+        (WebInspector._revealAndSelectRepresentedObjectInNavigationSidebar):
+        * UserInterface/TreeOutline.js:
+        (TreeElement.prototype.select):
+
+2013-06-18  Timothy Hatcher  &lt;timothy@apple.com&gt;
+
</ins><span class="cx">         Update breakpoints to match Xcode 5.
</span><span class="cx"> 
</span><span class="cx">         This updates the breakpoint images, line colors, and moves breakpoints toggle button
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceMainjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Main.js (151687 => 151688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Main.js        2013-06-18 18:49:28 UTC (rev 151687)
+++ trunk/Source/WebInspectorUI/UserInterface/Main.js        2013-06-18 19:38:01 UTC (rev 151688)
</span><span class="lines">@@ -827,6 +827,13 @@
</span><span class="cx">         return;
</span><span class="cx"> 
</span><span class="cx">     var selectedSidebarPanel = this.navigationSidebar.selectedSidebarPanel;
</span><ins>+
+    // If the tree outline is processing a selection currently then we can assume the selection does not
+    // need to be changed. This is needed to allow breakpoints tree elements to be selected without jumping
+    // back to selecting the resource tree element.
+    if (selectedSidebarPanel.contentTreeOutline.processingSelectionChange)
+        return;
+
</ins><span class="cx">     var treeElement = selectedSidebarPanel.treeElementForRepresentedObject(representedObject);
</span><span class="cx">     if (treeElement)
</span><span class="cx">         treeElement.revealAndSelect(true, false, true, true);
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceTreeOutlinejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/TreeOutline.js (151687 => 151688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/TreeOutline.js        2013-06-18 18:49:28 UTC (rev 151687)
+++ trunk/Source/WebInspectorUI/UserInterface/TreeOutline.js        2013-06-18 19:38:01 UTC (rev 151688)
</span><span class="lines">@@ -949,6 +949,8 @@
</span><span class="cx">     if (!this.treeOutline)
</span><span class="cx">         return;
</span><span class="cx"> 
</span><ins>+    this.treeOutline.processingSelectionChange = true;
+
</ins><span class="cx">     if (!this.selected) {
</span><span class="cx">         if (this.treeOutline.selectedTreeElement)
</span><span class="cx">             this.treeOutline.selectedTreeElement.deselect(suppressOnDeselect);
</span><span class="lines">@@ -965,6 +967,8 @@
</span><span class="cx"> 
</span><span class="cx">     if (this.treeOutline.onselect &amp;&amp; !suppressOnSelect)
</span><span class="cx">         this.treeOutline.onselect(this, selectedByUser);
</span><ins>+
+    delete this.treeOutline.processingSelectionChange;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>

</body>
</html>