<!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>[185757] 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/185757">185757</a></dd>
<dt>Author</dt> <dd>joepeck@webkit.org</dd>
<dt>Date</dt> <dd>2015-06-19 11:49:19 -0700 (Fri, 19 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Make rule icon toggle all properties for that selector on and off
https://bugs.webkit.org/show_bug.cgi?id=146031
Patch by Devin Rousso <drousso@apple.com> on 2015-06-19
Reviewed by Timothy Hatcher.
* UserInterface/Views/CSSStyleDeclarationSection.css:
(.style-declaration-section > .header > .icon.toggle-able:hover):
(.style-declaration-section.rule-disabled > .header > .icon):
* UserInterface/Views/CSSStyleDeclarationSection.js:
(WebInspector.CSSStyleDeclarationSection): Added event listener to selector icon to toggle commenting of all properties for that rule.
(WebInspector.CSSStyleDeclarationSection.prototype._toggleRuleOnOff): Adds or removes comments to all properties for that rule.
* UserInterface/Views/CSSStyleDeclarationTextEditor.js:
(WebInspector.CSSStyleDeclarationTextEditor.prototype.uncommentAllProperties.uncommentProperties):
(WebInspector.CSSStyleDeclarationTextEditor.prototype.uncommentAllProperties): Uncomments all properties.
(WebInspector.CSSStyleDeclarationTextEditor.prototype.commentAllProperties): Comments out all properties.
(WebInspector.CSSStyleDeclarationTextEditor.prototype._propertyCheckboxChanged): Moved comment logic to its own function.
(WebInspector.CSSStyleDeclarationTextEditor.prototype._propertyCommentCheckboxChanged): Moved uncomment logic to its own function.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs">trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsCSSStyleDeclarationSectioncss">trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationSection.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsCSSStyleDeclarationSectionjs">trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationSection.js</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 (185756 => 185757)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-06-19 18:18:05 UTC (rev 185756)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-06-19 18:49:19 UTC (rev 185757)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-06-19 Devin Rousso <drousso@apple.com>
+
+ Web Inspector: Make rule icon toggle all properties for that selector on and off
+ https://bugs.webkit.org/show_bug.cgi?id=146031
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Views/CSSStyleDeclarationSection.css:
+ (.style-declaration-section > .header > .icon.toggle-able:hover):
+ (.style-declaration-section.rule-disabled > .header > .icon):
+ * UserInterface/Views/CSSStyleDeclarationSection.js:
+ (WebInspector.CSSStyleDeclarationSection): Added event listener to selector icon to toggle commenting of all properties for that rule.
+ (WebInspector.CSSStyleDeclarationSection.prototype._toggleRuleOnOff): Adds or removes comments to all properties for that rule.
+ * UserInterface/Views/CSSStyleDeclarationTextEditor.js:
+ (WebInspector.CSSStyleDeclarationTextEditor.prototype.uncommentAllProperties.uncommentProperties):
+ (WebInspector.CSSStyleDeclarationTextEditor.prototype.uncommentAllProperties): Uncomments all properties.
+ (WebInspector.CSSStyleDeclarationTextEditor.prototype.commentAllProperties): Comments out all properties.
+ (WebInspector.CSSStyleDeclarationTextEditor.prototype._propertyCheckboxChanged): Moved comment logic to its own function.
+ (WebInspector.CSSStyleDeclarationTextEditor.prototype._propertyCommentCheckboxChanged): Moved uncomment logic to its own function.
+
</ins><span class="cx"> 2015-06-19 Jon Lee <jonlee@apple.com>
</span><span class="cx">
</span><span class="cx"> Update font and font-family keyword completions
</span></span></pre></div>
<a id="trunkSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (185756 => 185757)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2015-06-19 18:18:05 UTC (rev 185756)
+++ trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2015-06-19 18:49:19 UTC (rev 185757)
</span><span class="lines">@@ -107,6 +107,7 @@
</span><span class="cx"> localizedStrings["Code"] = "Code";
</span><span class="cx"> localizedStrings["Collapse columns"] = "Collapse columns";
</span><span class="cx"> localizedStrings["Comment"] = "Comment";
</span><ins>+localizedStrings["Comment All Properties"] = "Comment All Properties";
</ins><span class="cx"> localizedStrings["Compressed"] = "Compressed";
</span><span class="cx"> localizedStrings["Compression"] = "Compression";
</span><span class="cx"> localizedStrings["Computed"] = "Computed";
</span><span class="lines">@@ -493,6 +494,7 @@
</span><span class="cx"> localizedStrings["Type Issue"] = "Type Issue";
</span><span class="cx"> localizedStrings["Type information for variable: %s"] = "Type information for variable: %s";
</span><span class="cx"> localizedStrings["Unable to determine path to property from root"] = "Unable to determine path to property from root";
</span><ins>+localizedStrings["Uncomment All Properties"] = "Uncomment All Properties";
</ins><span class="cx"> localizedStrings["Unknown node"] = "Unknown node";
</span><span class="cx"> localizedStrings["Untitled"] = "Untitled";
</span><span class="cx"> localizedStrings["User Agent Stylesheet"] = "User Agent Stylesheet";
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsCSSStyleDeclarationSectioncss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationSection.css (185756 => 185757)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationSection.css 2015-06-19 18:18:05 UTC (rev 185756)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationSection.css 2015-06-19 18:49:19 UTC (rev 185757)
</span><span class="lines">@@ -68,6 +68,14 @@
</span><span class="cx"> height: 16px;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.style-declaration-section > .header > .icon.toggle-able:hover {
+ -webkit-filter: brightness(0.9);
+}
+
+.style-declaration-section.rule-disabled > .header > .icon {
+ opacity: 0.5;
+}
+
</ins><span class="cx"> .style-declaration-section > .header > .selector {
</span><span class="cx"> font-family: Menlo, monospace;
</span><span class="cx"> color: rgb(128, 128, 128);
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsCSSStyleDeclarationSectionjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationSection.js (185756 => 185757)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationSection.js 2015-06-19 18:18:05 UTC (rev 185756)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationSection.js 2015-06-19 18:49:19 UTC (rev 185757)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> console.assert(style);
</span><span class="cx"> this._style = style || null;
</span><span class="cx"> this._selectorElements = [];
</span><ins>+ this._ruleDisabled = false;
</ins><span class="cx">
</span><span class="cx"> this._element = document.createElement("div");
</span><span class="cx"> this._element.className = "style-declaration-section";
</span><span class="lines">@@ -88,6 +89,13 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Matches all situations except for User Agent styles.
+ if (!(style.ownerRule && style.ownerRule.type === WebInspector.CSSRule.Type.UserAgent)) {
+ this._iconElement.classList.add("toggle-able");
+ this._iconElement.title = WebInspector.UIString("Comment All Properties");
+ this._iconElement.addEventListener("click", this._toggleRuleOnOff.bind(this));
+ }
+
</ins><span class="cx"> console.assert(iconClassName);
</span><span class="cx"> this._element.classList.add(iconClassName);
</span><span class="cx">
</span><span class="lines">@@ -376,6 +384,13 @@
</span><span class="cx"> return styleText;
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ _toggleRuleOnOff: function()
+ {
+ this._ruleDisabled = this._ruleDisabled ? !this._propertiesTextEditor.uncommentAllProperties() : this._propertiesTextEditor.commentAllProperties();
+ this._iconElement.title = this._ruleDisabled ? WebInspector.UIString("Uncomment All Properties") : WebInspector.UIString("Comment All Properties");
+ this._element.classList.toggle("rule-disabled", this._ruleDisabled);
+ },
+
</ins><span class="cx"> _commitSelector: function(mutations)
</span><span class="cx"> {
</span><span class="cx"> console.assert(this._style.ownerRule);
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsCSSStyleDeclarationTextEditorjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationTextEditor.js (185756 => 185757)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationTextEditor.js 2015-06-19 18:18:05 UTC (rev 185756)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationTextEditor.js 2015-06-19 18:49:19 UTC (rev 185757)
</span><span class="lines">@@ -302,6 +302,39 @@
</span><span class="cx"> return matchingPropertyNames.length > 0;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ uncommentAllProperties()
+ {
+ function uncommentProperties(properties)
+ {
+ if (!properties.length)
+ return false;
+
+ for (var property of properties) {
+ if (property._commentRange) {
+ this._uncommentRange(property._commentRange);
+ property._commentRange = null;
+ }
+ }
+
+ return true;
+ }
+
+ return uncommentProperties.call(this, this._style.pendingProperties) || uncommentProperties.call(this, this._style.properties);
+ }
+
+ commentAllProperties()
+ {
+ if (!this._style.properties.length)
+ return false;
+
+ for (var property of this._style.properties) {
+ if (property.__propertyTextMarker)
+ this._commentProperty(property);
+ }
+
+ return true;
+ }
+
</ins><span class="cx"> // Protected
</span><span class="cx">
</span><span class="cx"> didDismissPopover(popover)
</span><span class="lines">@@ -712,6 +745,11 @@
</span><span class="cx"> if (!property)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ this._commentProperty(property);
+ }
+
+ _commentProperty(property)
+ {
</ins><span class="cx"> var textMarker = property.__propertyTextMarker;
</span><span class="cx"> console.assert(textMarker);
</span><span class="cx"> if (!textMarker)
</span><span class="lines">@@ -723,6 +761,9 @@
</span><span class="cx"> if (!range)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ property._commentRange = range;
+ property._commentRange.to.ch += 6; // Number of characters added by comments.
+
</ins><span class="cx"> var text = this._codeMirror.getRange(range.from, range.to);
</span><span class="cx">
</span><span class="cx"> function update()
</span><span class="lines">@@ -750,6 +791,11 @@
</span><span class="cx"> if (!range)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ this._uncommentRange(range);
+ }
+
+ _uncommentRange(range)
+ {
</ins><span class="cx"> var text = this._codeMirror.getRange(range.from, range.to);
</span><span class="cx">
</span><span class="cx"> // Remove the comment prefix and suffix.
</span></span></pre>
</div>
</div>
</body>
</html>