<!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>[193128] branches/safari-601-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/193128">193128</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2015-12-03 10:49:18 -0800 (Thu, 03 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/188617">r188617</a>. rdar://problem/23221163</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchSourceWebInspectorUIChangeLog">branches/safari-601-branch/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsVisualStyleDetailsPanelcss">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/VisualStyleDetailsPanel.css</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsVisualStyleDetailsPaneljs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/VisualStyleDetailsPanel.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/ChangeLog (193127 => 193128)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:49:13 UTC (rev 193127)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:49:18 UTC (rev 193128)
</span><span class="lines">@@ -1,5 +1,28 @@
</span><span class="cx"> 2015-12-02 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Merge r188617. rdar://problem/23221163
+
+ 2015-08-18 Devin Rousso <drousso@apple.com>
+
+ Web Inspector: Consider showing style summary on collapsed visual sidebar sections
+ https://bugs.webkit.org/show_bug.cgi?id=148104
+
+ Reviewed by Timothy Hatcher.
+
+ The blue indicator dot on a section now means that that section has at least one set value.
+ If a section has been modified, it will display a trash can that will clear those modifications.
+
+ * UserInterface/Views/VisualStyleDetailsPanel.css:
+ (.sidebar > .panel.details.css-style .visual > .details-section .details-section.has-set-property > .header > span::after):
+ (.sidebar > .panel.details.css-style .visual > .details-section .details-section.modified > .header > span::after): Deleted.
+
+ * UserInterface/Views/VisualStyleDetailsPanel.js:
+ (WebInspector.VisualStyleDetailsPanel.prototype._updateProperties):
+ (WebInspector.VisualStyleDetailsPanel.prototype._sectionModified):
+ (WebInspector.VisualStyleDetailsPanel.prototype._groupHasSetProperty):
+
+2015-12-02 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Merge r188616. rdar://problem/23221163
</span><span class="cx">
</span><span class="cx"> 2015-08-18 Devin Rousso <drousso@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsVisualStyleDetailsPanelcss"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/VisualStyleDetailsPanel.css (193127 => 193128)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/VisualStyleDetailsPanel.css 2015-12-03 18:49:13 UTC (rev 193127)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/VisualStyleDetailsPanel.css 2015-12-03 18:49:18 UTC (rev 193128)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> display: flex;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.sidebar > .panel.details.css-style .visual > .details-section .details-section.modified > .header > span::after {
</del><ins>+.sidebar > .panel.details.css-style .visual > .details-section .details-section.has-set-property > .header > span::after {
</ins><span class="cx"> width: 7px;
</span><span class="cx"> height: 7px;
</span><span class="cx"> margin: 4px 6px;
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsVisualStyleDetailsPaneljs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/VisualStyleDetailsPanel.js (193127 => 193128)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/VisualStyleDetailsPanel.js 2015-12-03 18:49:13 UTC (rev 193127)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/VisualStyleDetailsPanel.js 2015-12-03 18:49:18 UTC (rev 193128)
</span><span class="lines">@@ -187,23 +187,21 @@
</span><span class="cx">
</span><span class="cx"> var initialPropertyText = {};
</span><span class="cx"> var initialPropertyTextMissing = !initialTextList.has(group);
</span><del>- var onePropertyHasValue = false;
</del><span class="cx"> for (let key in group.properties) {
</span><span class="cx"> var propertyEditor = group.properties[key];
</span><span class="cx"> propertyEditor.update(!propertyEditor.style || forceStyleUpdate ? this._currentStyle : null);
</span><span class="cx">
</span><span class="cx"> var value = propertyEditor.synthesizedValue;
</span><del>- if (value && !propertyEditor.propertyMissing) {
- onePropertyHasValue = true;
- if (initialPropertyTextMissing)
- initialPropertyText[key] = value;
- }
</del><ins>+ if (value && !propertyEditor.propertyMissing && initialPropertyTextMissing)
+ initialPropertyText[key] = value;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (initialPropertyTextMissing)
</span><span class="cx"> initialTextList.set(group, initialPropertyText);
</span><span class="cx">
</span><del>- group.section.collapsed = !onePropertyHasValue && !group.section.expandedByUser;
</del><ins>+ var groupHasSetProperty = this._groupHasSetProperty(group);
+ group.section.collapsed = !groupHasSetProperty && !group.section.expandedByUser;
+ group.section.element.classList.toggle("has-set-property", groupHasSetProperty);
</ins><span class="cx"> this._sectionModified(group);
</span><span class="cx">
</span><span class="cx"> var autocompleteCompatibleProperties = group.autocompleteCompatibleProperties;
</span><span class="lines">@@ -225,6 +223,7 @@
</span><span class="cx"> _sectionModified(group)
</span><span class="cx"> {
</span><span class="cx"> group.section.element.classList.toggle("modified", this._initialPropertyTextModified(group));
</span><ins>+ group.section.element.classList.toggle("has-set-property", this._groupHasSetProperty(group));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> _clearModifiedSection(groupId)
</span><span class="lines">@@ -273,6 +272,17 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ _groupHasSetProperty(group)
+ {
+ for (let key in group.properties) {
+ var propertyEditor = group.properties[key];
+ var value = propertyEditor.synthesizedValue;
+ if (value && !propertyEditor.propertyMissing)
+ return true;
+ }
+ return false;
+ }
+
</ins><span class="cx"> _populateSection(group, groups)
</span><span class="cx"> {
</span><span class="cx"> if (!group || !groups)
</span></span></pre>
</div>
</div>
</body>
</html>