<!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>[37523] trunk/WebCore</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/37523">37523</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2008-10-12 10:04:51 -0700 (Sun, 12 Oct 2008)</dd>
</dl>

<h3>Log Message</h3>
<pre>        Remember the expanded state of the rules in the Styles pane. So
        collapsing a rule will persist across all the elements that have
        that same rule. The same applies to Computed Style, so the Computed
        Style rule is now collapsed by default. This should help lessen the
        confusion on why Computed Style can't be edited (a common confusion.)

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

        Reviewed by Darin Adler.

        * inspector/front-end/PropertiesSection.js:
        (WebInspector.PropertiesSection): Set the _expanded property directly,
        instead of using the setter. Expanded is the default, so no work is needed.
        This prevents calling StylesSidebarPane.collapse before object initialization
        is complete.
        * inspector/front-end/StylesSidebarPane.js:
        (WebInspector.StylesSidebarPane.prototype.update): Check the Preferences object
        for the expanded state of the StylePropertiesSection. Collapse computed style
        by default and expand everything else.
        (WebInspector.StylePropertiesSection): Make a semi unique identifier to be used
        when remembering expanded state.
        (WebInspector.StylePropertiesSection.prototype.expand): Set the expanded state
        to true for this identifier in Preferences.styleRulesExpandedState. Don't remember
        the state if the dontRememberState property is true.
        (WebInspector.StylePropertiesSection.prototype.collapse): Set the expanded state
        to false for this identifier in Preferences.styleRulesExpandedState.
        * inspector/front-end/inspector.js:
        (Preferences.styleRulesExpandedState): Initialize to an empty object.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCoreinspectorfrontendPropertiesSectionjs">trunk/WebCore/inspector/front-end/PropertiesSection.js</a></li>
<li><a href="#trunkWebCoreinspectorfrontendStylesSidebarPanejs">trunk/WebCore/inspector/front-end/StylesSidebarPane.js</a></li>
<li><a href="#trunkWebCoreinspectorfrontendinspectorjs">trunk/WebCore/inspector/front-end/inspector.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (37522 => 37523)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2008-10-12 11:47:04 UTC (rev 37522)
+++ trunk/WebCore/ChangeLog        2008-10-12 17:04:51 UTC (rev 37523)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2008-10-12  Timothy Hatcher  &lt;timothy@apple.com&gt;
+
+        Remember the expanded state of the rules in the Styles pane. So
+        collapsing a rule will persist across all the elements that have
+        that same rule. The same applies to Computed Style, so the Computed
+        Style rule is now collapsed by default. This should help lessen the
+        confusion on why Computed Style can't be edited (a common confusion.)
+
+        https://bugs.webkit.org/show_bug.cgi?id=21553
+
+        Reviewed by Darin Adler.
+
+        * inspector/front-end/PropertiesSection.js:
+        (WebInspector.PropertiesSection): Set the _expanded property directly,
+        instead of using the setter. Expanded is the default, so no work is needed.
+        This prevents calling StylesSidebarPane.collapse before object initialization
+        is complete.
+        * inspector/front-end/StylesSidebarPane.js:
+        (WebInspector.StylesSidebarPane.prototype.update): Check the Preferences object
+        for the expanded state of the StylePropertiesSection. Collapse computed style
+        by default and expand everything else.
+        (WebInspector.StylePropertiesSection): Make a semi unique identifier to be used
+        when remembering expanded state.
+        (WebInspector.StylePropertiesSection.prototype.expand): Set the expanded state
+        to true for this identifier in Preferences.styleRulesExpandedState. Don't remember
+        the state if the dontRememberState property is true.
+        (WebInspector.StylePropertiesSection.prototype.collapse): Set the expanded state
+        to false for this identifier in Preferences.styleRulesExpandedState.
+        * inspector/front-end/inspector.js:
+        (Preferences.styleRulesExpandedState): Initialize to an empty object.
+
</ins><span class="cx"> 2008-10-12  Jan Michael Alonzo  &lt;jmalonzo@webkit.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Alp Toker.
</span></span></pre></div>
<a id="trunkWebCoreinspectorfrontendPropertiesSectionjs"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/inspector/front-end/PropertiesSection.js (37522 => 37523)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/inspector/front-end/PropertiesSection.js        2008-10-12 11:47:04 UTC (rev 37522)
+++ trunk/WebCore/inspector/front-end/PropertiesSection.js        2008-10-12 17:04:51 UTC (rev 37523)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> 
</span><span class="cx">     this.title = title;
</span><span class="cx">     this.subtitle = subtitle;
</span><del>-    this.expanded = false;
</del><ins>+    this._expanded = false;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> WebInspector.PropertiesSection.prototype = {
</span></span></pre></div>
<a id="trunkWebCoreinspectorfrontendStylesSidebarPanejs"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/inspector/front-end/StylesSidebarPane.js (37522 => 37523)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/inspector/front-end/StylesSidebarPane.js        2008-10-12 11:47:04 UTC (rev 37522)
+++ trunk/WebCore/inspector/front-end/StylesSidebarPane.js        2008-10-12 17:04:51 UTC (rev 37523)
</span><span class="lines">@@ -229,9 +229,15 @@
</span><span class="cx">                 var section = new WebInspector.StylePropertiesSection(styleRule, subtitle, computedStyle, (ruleUsedProperties || usedProperties), editable);
</span><span class="cx">                 if (computedStyle)
</span><span class="cx">                     section.disabledComputedProperties = disabledComputedProperties;
</span><del>-                section.expanded = true;
</del><span class="cx">                 section.pane = this;
</span><span class="cx"> 
</span><ins>+                if (Preferences.styleRulesExpandedState &amp;&amp; section.identifier in Preferences.styleRulesExpandedState)
+                    section.expanded = Preferences.styleRulesExpandedState[section.identifier];
+                else if (computedStyle)
+                    section.collapse(true);
+                else
+                    section.expand(true);
+
</ins><span class="cx">                 body.appendChild(section.element);
</span><span class="cx">                 this.sections.push(section);
</span><span class="cx">             }
</span><span class="lines">@@ -299,6 +305,10 @@
</span><span class="cx"> 
</span><span class="cx">         this.subtitle = subtitle;
</span><span class="cx">     }
</span><ins>+
+    this.identifier = styleRule.selectorText;
+    if (this.subtitle)
+        this.identifier += &quot;:&quot; + this.subtitleElement.textContent;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> WebInspector.StylePropertiesSection.prototype = {
</span><span class="lines">@@ -313,6 +323,28 @@
</span><span class="cx">         this.update();
</span><span class="cx">     },
</span><span class="cx"> 
</span><ins>+    expand: function(dontRememberState)
+    {
+        WebInspector.PropertiesSection.prototype.expand.call(this);
+        if (dontRememberState)
+            return;
+
+        if (!Preferences.styleRulesExpandedState)
+            Preferences.styleRulesExpandedState = {};
+        Preferences.styleRulesExpandedState[this.identifier] = true;
+    },
+
+    collapse: function(dontRememberState)
+    {
+        WebInspector.PropertiesSection.prototype.collapse.call(this);
+        if (dontRememberState)
+            return;
+
+        if (!Preferences.styleRulesExpandedState)
+            Preferences.styleRulesExpandedState = {};
+        Preferences.styleRulesExpandedState[this.identifier] = false;
+    },
+
</ins><span class="cx">     isPropertyInherited: function(property)
</span><span class="cx">     {
</span><span class="cx">         if (!this.computedStyle || !this._usedProperties)
</span></span></pre></div>
<a id="trunkWebCoreinspectorfrontendinspectorjs"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/inspector/front-end/inspector.js (37522 => 37523)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/inspector/front-end/inspector.js        2008-10-12 11:47:04 UTC (rev 37522)
+++ trunk/WebCore/inspector/front-end/inspector.js        2008-10-12 17:04:51 UTC (rev 37523)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx">     minElementsSidebarWidth: 200,
</span><span class="cx">     minScriptsSidebarWidth: 200,
</span><span class="cx">     showInheritedComputedStyleProperties: false,
</span><ins>+    styleRulesExpandedState: {},
</ins><span class="cx">     showMissingLocalizedStrings: false
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>