<!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>[193129] 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/193129">193129</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2015-12-03 10:49:24 -0800 (Thu, 03 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/188621">r188621</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="#branchessafari601branchSourceWebInspectorUIUserInterfaceImagesVisualStylePropertyUnlinkedsvg">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Images/VisualStylePropertyUnlinked.svg</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsVisualStyleDetailsPaneljs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/VisualStyleDetailsPanel.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsVisualStylePropertyEditorLinkjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/VisualStylePropertyEditorLink.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 (193128 => 193129)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:49:18 UTC (rev 193128)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:49:24 UTC (rev 193129)
</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 r188621. rdar://problem/23221163
+
+ 2015-08-18 Devin Rousso <drousso@apple.com>
+
+ Web Inspector: Visual editor links should unlink when switching styles
+ https://bugs.webkit.org/show_bug.cgi?id=148153
+
+ Reviewed by Timothy Hatcher.
+
+ Visual editor links are now deactivated when switching rules/nodes.
+
+ * UserInterface/Images/VisualStylePropertyUnlinked.svg:
+ * UserInterface/Views/VisualStyleDetailsPanel.js:
+ (WebInspector.VisualStyleDetailsPanel.prototype._updateProperties):
+ (WebInspector.VisualStyleDetailsPanel.prototype._generateMetricSectionRows):
+
+ * UserInterface/Views/VisualStylePropertyEditorLink.js:
+ (WebInspector.VisualStylePropertyEditorLink.prototype.set linked):
+ (WebInspector.VisualStylePropertyEditorLink.prototype._iconClicked):
+ (WebInspector.VisualStylePropertyEditorLink):
+
+2015-12-02 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Merge r188617. 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="branchessafari601branchSourceWebInspectorUIUserInterfaceImagesVisualStylePropertyUnlinkedsvg"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Images/VisualStylePropertyUnlinked.svg (193128 => 193129)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Images/VisualStylePropertyUnlinked.svg 2015-12-03 18:49:18 UTC (rev 193128)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Images/VisualStylePropertyUnlinked.svg 2015-12-03 18:49:24 UTC (rev 193129)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> <?xml version="1.0" encoding="utf-8"?>
</span><span class="cx"> <!-- Copyright © 2015 Apple Inc. All rights reserved. -->
</span><span class="cx"> <svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
</span><del>- <path class="filled" d="M 10 4 C 16 4 16 12 10 12" stroke="none" />
- <path class="filled" d="M 6 4 C 0 4 0 12 6 12" stroke="none" />
</del><ins>+ <path class="filled" d="M 6.5 4 C 0 4 0 12 6.5 12" stroke="none" />
+ <path class="filled" d="M 9.5 4 C 16 4 16 12 9.5 12" stroke="none" />
</ins><span class="cx"> </svg>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsVisualStyleDetailsPaneljs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/VisualStyleDetailsPanel.js (193128 => 193129)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/VisualStyleDetailsPanel.js 2015-12-03 18:49:18 UTC (rev 193128)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/VisualStyleDetailsPanel.js 2015-12-03 18:49:24 UTC (rev 193129)
</span><span class="lines">@@ -181,6 +181,11 @@
</span><span class="cx"> if (!group.section)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ if (group.links) {
+ for (let key in group.links)
+ group.links[key].linked = false;
+ }
+
</ins><span class="cx"> var initialTextList = this._initialTextList;
</span><span class="cx"> if (!initialTextList)
</span><span class="cx"> this._currentStyle[WebInspector.VisualStyleDetailsPanel.InitialPropertySectionTextListSymbol] = initialTextList = new WeakMap;
</span><span class="lines">@@ -363,6 +368,7 @@
</span><span class="cx"> _generateMetricSectionRows(group, prefix, allowNegatives, highlightOnHover)
</span><span class="cx"> {
</span><span class="cx"> var properties = group.properties;
</span><ins>+ var links = group.links = {};
</ins><span class="cx">
</span><span class="cx"> var hasPrefix = prefix && prefix.length;
</span><span class="cx"> var propertyNamePrefix = hasPrefix ? prefix + "-" : "";
</span><span class="lines">@@ -376,33 +382,33 @@
</span><span class="cx">
</span><span class="cx"> properties[top] = new WebInspector.VisualStyleNumberInputBox(propertyNamePrefix + "top", WebInspector.UIString("Top"), this._keywords.boxModel, this._units.defaults, allowNegatives);
</span><span class="cx"> properties[bottom] = new WebInspector.VisualStyleNumberInputBox(propertyNamePrefix + "bottom", WebInspector.UIString("Bottom"), this._keywords.boxModel, this._units.defaults, allowNegatives, true);
</span><del>- var verticalLink = new WebInspector.VisualStylePropertyEditorLink([properties[top], properties[bottom]], "link-vertical");
</del><ins>+ links["vertical"] = new WebInspector.VisualStylePropertyEditorLink([properties[top], properties[bottom]], "link-vertical");
</ins><span class="cx">
</span><span class="cx"> vertical.element.appendChild(properties[top].element);
</span><del>- vertical.element.appendChild(verticalLink.element);
</del><ins>+ vertical.element.appendChild(links["vertical"].element);
</ins><span class="cx"> vertical.element.appendChild(properties[bottom].element);
</span><span class="cx">
</span><span class="cx"> var horizontal = new WebInspector.DetailsSectionRow;
</span><span class="cx">
</span><span class="cx"> properties[left] = new WebInspector.VisualStyleNumberInputBox(propertyNamePrefix + "left", WebInspector.UIString("Left"), this._keywords.boxModel, this._units.defaults, allowNegatives);
</span><span class="cx"> properties[right] = new WebInspector.VisualStyleNumberInputBox(propertyNamePrefix + "right", WebInspector.UIString("Right"), this._keywords.boxModel, this._units.defaults, allowNegatives, true);
</span><del>- var horizontalLink = new WebInspector.VisualStylePropertyEditorLink([properties[left], properties[right]], "link-horizontal");
</del><ins>+ links["horizontal"] = new WebInspector.VisualStylePropertyEditorLink([properties[left], properties[right]], "link-horizontal");
</ins><span class="cx">
</span><span class="cx"> horizontal.element.appendChild(properties[left].element);
</span><del>- horizontal.element.appendChild(horizontalLink.element);
</del><ins>+ horizontal.element.appendChild(links["horizontal"].element);
</ins><span class="cx"> horizontal.element.appendChild(properties[right].element);
</span><span class="cx">
</span><span class="cx"> var allLinkRow = new WebInspector.DetailsSectionRow;
</span><del>- var allLink = new WebInspector.VisualStylePropertyEditorLink([properties[top], properties[bottom], properties[left], properties[right]], "link-all", [verticalLink, horizontalLink]);
- allLinkRow.element.appendChild(allLink.element);
</del><ins>+ links["all"] = new WebInspector.VisualStylePropertyEditorLink([properties[top], properties[bottom], properties[left], properties[right]], "link-all", [links["vertical"], links["horizontal"]]);
+ allLinkRow.element.appendChild(links["all"].element);
</ins><span class="cx">
</span><span class="cx"> if (highlightOnHover) {
</span><span class="cx"> this._addMetricsMouseListeners(properties[top], prefix);
</span><del>- this._addMetricsMouseListeners(verticalLink, prefix);
</del><ins>+ this._addMetricsMouseListeners(links["vertical"], prefix);
</ins><span class="cx"> this._addMetricsMouseListeners(properties[bottom], prefix);
</span><del>- this._addMetricsMouseListeners(allLink, prefix);
</del><ins>+ this._addMetricsMouseListeners(links["all"], prefix);
</ins><span class="cx"> this._addMetricsMouseListeners(properties[left], prefix);
</span><del>- this._addMetricsMouseListeners(horizontalLink, prefix);
</del><ins>+ this._addMetricsMouseListeners(links["horizontal"], prefix);
</ins><span class="cx"> this._addMetricsMouseListeners(properties[right], prefix);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsVisualStylePropertyEditorLinkjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/VisualStylePropertyEditorLink.js (193128 => 193129)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/VisualStylePropertyEditorLink.js 2015-12-03 18:49:18 UTC (rev 193128)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/VisualStylePropertyEditorLink.js 2015-12-03 18:49:24 UTC (rev 193129)
</span><span class="lines">@@ -78,6 +78,18 @@
</span><span class="cx"> return this._element;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ set linked(flag)
+ {
+ this._linked = flag;
+ this._element.classList.toggle("linked", this._linked);
+ this._linkedIcon.hidden = !this._linked;
+ this._unlinkedIcon.hidden = this._linked;
+ this._iconElement.title = this._linked ? WebInspector.UIString("Click to remove link") : WebInspector.UIString("Click to link property values");
+
+ for (let linkToHide of this._linksToHideWhenLinked)
+ linkToHide.disabled = this._linked;
+ }
+
</ins><span class="cx"> set disabled(flag)
</span><span class="cx"> {
</span><span class="cx"> this._disabled = flag;
</span><span class="lines">@@ -128,15 +140,7 @@
</span><span class="cx">
</span><span class="cx"> _iconClicked()
</span><span class="cx"> {
</span><del>- this._linked = !this._linked;
- this._element.classList.toggle("linked", this._linked);
- this._linkedIcon.hidden = !this._linked;
- this._unlinkedIcon.hidden = this._linked;
-
- this._iconElement.title = this._linked ? WebInspector.UIString("Click to remove link") : WebInspector.UIString("Click to link property values");
-
</del><ins>+ this.linked = !this._linked;
</ins><span class="cx"> this._updateLinkedEditors(this._lastPropertyEdited || this._linkedProperties[0]);
</span><del>- for (let linkToHide of this._linksToHideWhenLinked)
- linkToHide.disabled = this._linked;
</del><span class="cx"> }
</span><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>