<!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>[185789] 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/185789">185789</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-06-19 23:20:21 -0700 (Fri, 19 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Duplication of style attribute in rules panel for shadow content
https://bugs.webkit.org/show_bug.cgi?id=146176
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2015-06-19
Reviewed by Timothy Hatcher.
* UserInterface/Views/CSSStyleDeclarationTextEditor.js:
The styleText can be non-empty for a readonly editor if the editor is for
the style attribute of a shadow dom node. Instead of assuming it is empty
we can just clear the editor ourselves and regenerate from properties.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsCSSStyleDeclarationTextEditorjs">trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationTextEditor.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (185788 => 185789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-06-20 02:41:09 UTC (rev 185788)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-06-20 06:20:21 UTC (rev 185789)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-06-19 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Duplication of style attribute in rules panel for shadow content
+ https://bugs.webkit.org/show_bug.cgi?id=146176
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Views/CSSStyleDeclarationTextEditor.js:
+ The styleText can be non-empty for a readonly editor if the editor is for
+ the style attribute of a shadow dom node. Instead of assuming it is empty
+ we can just clear the editor ourselves and regenerate from properties.
+
</ins><span class="cx"> 2015-06-19 Devin Rousso <drousso@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Highlight currently edited CSS selector
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsCSSStyleDeclarationTextEditorjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationTextEditor.js (185788 => 185789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationTextEditor.js 2015-06-20 02:41:09 UTC (rev 185788)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationTextEditor.js 2015-06-20 06:20:21 UTC (rev 185789)
</span><span class="lines">@@ -1052,19 +1052,16 @@
</span><span class="cx"> var styleText = this._style.text.trim();
</span><span class="cx"> var findWhitespace = /\s+/g;
</span><span class="cx">
</span><del>- // Only format non-empty styles. Keep in mind that styleText is always empty
- // for "readOnly" Editors. But prepare Checkbox placeholders in any case.
- // Because that will indent the cursor when the User starts typing.
</del><ins>+ // We only need to format non-empty styles, but prepare checkbox placeholders
+ // in any case because that will indent the cursor when the User starts typing.
</ins><span class="cx"> if (!styleText && !isEditorReadOnly) {
</span><span class="cx"> this._markLinesWithCheckboxPlaceholder();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Set non-optimized, valid and invalid styles in preparation for the Formatter.
- // Set empty string in case of readonly styles.
- this._codeMirror.setValue(styleText);
-
</del><ins>+ // Generate formatted content for readonly editors by iterating properties.
</ins><span class="cx"> if (isEditorReadOnly) {
</span><ins>+ this._codeMirror.setValue("");
</ins><span class="cx"> var lineNumber = 0;
</span><span class="cx"> this._iterateOverProperties(false, function(property) {
</span><span class="cx"> var from = {line: lineNumber, ch: 0};
</span><span class="lines">@@ -1074,10 +1071,12 @@
</span><span class="cx"> this._createTextMarkerForPropertyIfNeeded(from, to, property);
</span><span class="cx"> lineNumber++;
</span><span class="cx"> });
</span><del>-
</del><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Set non-optimized, valid and invalid styles in preparation for the Formatter.
+ this._codeMirror.setValue(styleText);
+
</ins><span class="cx"> // Now the Formatter pretty prints the styles.
</span><span class="cx"> this._codeMirror.setValue(this._formattedContentFromEditor());
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>