<!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>[197059] 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/197059">197059</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-02-24 17:28:51 -0800 (Wed, 24 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Visual Styles sidebar should support multiple animations
https://bugs.webkit.org/show_bug.cgi?id=154546
<rdar://problem/24773861>
Patch by Devin Rousso <dcrousso+webkit@gmail.com> on 2016-02-24
Reviewed by Timothy Hatcher.
* UserInterface/Views/VisualStyleDetailsPanel.js:
(WebInspector.VisualStyleDetailsPanel.prototype._populateTransitionSection):
Set additional flags on the optional properties of transition to ensure
that the initial value of a new row is not considered invalid.
(WebInspector.VisualStyleDetailsPanel.prototype._populateAnimationSection):
Added a comma-separated keyword list to provide support for multiple
animations per rule.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsVisualStyleDetailsPaneljs">trunk/Source/WebInspectorUI/UserInterface/Views/VisualStyleDetailsPanel.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (197058 => 197059)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-02-25 01:11:54 UTC (rev 197058)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-02-25 01:28:51 UTC (rev 197059)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-02-24 Devin Rousso <dcrousso+webkit@gmail.com>
+
+ Web Inspector: Visual Styles sidebar should support multiple animations
+ https://bugs.webkit.org/show_bug.cgi?id=154546
+ <rdar://problem/24773861>
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Views/VisualStyleDetailsPanel.js:
+ (WebInspector.VisualStyleDetailsPanel.prototype._populateTransitionSection):
+ Set additional flags on the optional properties of transition to ensure
+ that the initial value of a new row is not considered invalid.
+
+ (WebInspector.VisualStyleDetailsPanel.prototype._populateAnimationSection):
+ Added a comma-separated keyword list to provide support for multiple
+ animations per rule.
+
</ins><span class="cx"> 2016-02-24 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Remove unused Profile.png images
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsVisualStyleDetailsPaneljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/VisualStyleDetailsPanel.js (197058 => 197059)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/VisualStyleDetailsPanel.js 2016-02-25 01:11:54 UTC (rev 197058)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/VisualStyleDetailsPanel.js 2016-02-25 01:28:51 UTC (rev 197059)
</span><span class="lines">@@ -1264,7 +1264,9 @@
</span><span class="cx"> let transitionPropertyRow = new WebInspector.DetailsSectionRow;
</span><span class="cx">
</span><span class="cx"> let transitionProperty = new WebInspector.VisualStylePropertyNameInput("transition-property", WebInspector.UIString("Property"));
</span><ins>+ transitionProperty.masterProperty = true;
</ins><span class="cx"> let transitionTiming = new WebInspector.VisualStyleTimingEditor("transition-timing-function", WebInspector.UIString("Timing"), ["Linear", "Ease", "Ease In", "Ease Out", "Ease In Out"]);
</span><ins>+ transitionTiming.optionalProperty = true;
</ins><span class="cx">
</span><span class="cx"> transitionPropertyRow.element.appendChild(transitionProperty.element);
</span><span class="cx"> transitionPropertyRow.element.appendChild(transitionTiming.element);
</span><span class="lines">@@ -1273,13 +1275,14 @@
</span><span class="cx">
</span><span class="cx"> let transitionTimeKeywords = ["s", "ms"];
</span><span class="cx"> let transitionDuration = new WebInspector.VisualStyleNumberInputBox("transition-duration", WebInspector.UIString("Duration"), null, transitionTimeKeywords);
</span><ins>+ transitionDuration.optionalProperty = true;
</ins><span class="cx"> let transitionDelay = new WebInspector.VisualStyleNumberInputBox("transition-delay", WebInspector.UIString("Delay"), null, transitionTimeKeywords);
</span><span class="cx"> transitionDelay.optionalProperty = true;
</span><span class="cx">
</span><span class="cx"> transitionDurationRow.element.appendChild(transitionDuration.element);
</span><span class="cx"> transitionDurationRow.element.appendChild(transitionDelay.element);
</span><span class="cx">
</span><del>- let transitionProperties = [transitionProperty, transitionTiming, transitionDuration, transitionDelay];
</del><ins>+ let transitionProperties = [transitionProperty, transitionDuration, transitionTiming, transitionDelay];
</ins><span class="cx"> let transitionPropertyCombiner = new WebInspector.VisualStylePropertyCombiner("transition", transitionProperties);
</span><span class="cx">
</span><span class="cx"> let noRemainingCommaSeparatedEditorItems = this._noRemainingCommaSeparatedEditorItems.bind(this, transitionPropertyCombiner, transitionProperties);
</span><span class="lines">@@ -1303,47 +1306,84 @@
</span><span class="cx"> let group = this._groups.animation;
</span><span class="cx"> let properties = group.properties;
</span><span class="cx">
</span><ins>+ let animationRow = new WebInspector.DetailsSectionRow;
+
+ properties.animation = new WebInspector.VisualStyleCommaSeparatedKeywordEditor("animation", null, {
+ "animation-name": "none",
+ "animation-timing-function": "ease",
+ "animation-iteration-count": "1",
+ "animation-duration": "0",
+ "animation-delay": "0",
+ "animation-direction": "normal",
+ "animation-fill-mode": "none",
+ "animation-play-state": "running"
+ });
+
+ animationRow.element.appendChild(properties.animation.element);
+
</ins><span class="cx"> let animationNameRow = new WebInspector.DetailsSectionRow;
</span><span class="cx">
</span><del>- properties.animationName = new WebInspector.VisualStyleBasicInput("animation-name", WebInspector.UIString("Name"), WebInspector.UIString("Enter the name of a Keyframe"));
</del><ins>+ let animationName = new WebInspector.VisualStyleBasicInput("animation-name", WebInspector.UIString("Name"), WebInspector.UIString("Enter the name of a Keyframe"));
+ animationName.masterProperty = true;
</ins><span class="cx">
</span><del>- animationNameRow.element.appendChild(properties.animationName.element);
</del><ins>+ animationNameRow.element.appendChild(animationName.element);
</ins><span class="cx">
</span><span class="cx"> let animationTimingRow = new WebInspector.DetailsSectionRow;
</span><span class="cx">
</span><del>- properties.animationTiming = new WebInspector.VisualStyleTimingEditor("animation-timing-function", WebInspector.UIString("Timing"), ["Linear", "Ease", "Ease In", "Ease Out", "Ease In Out"]);
- properties.animationIterationCount = new WebInspector.VisualStyleNumberInputBox("animation-iteration-count", WebInspector.UIString("Iterations"), this._keywords.defaults.concat(["Infinite"]), null);
</del><ins>+ let animationTiming = new WebInspector.VisualStyleTimingEditor("animation-timing-function", WebInspector.UIString("Timing"), ["Linear", "Ease", "Ease In", "Ease Out", "Ease In Out"]);
+ animationTiming.optionalProperty = true;
+ let animationIterationCount = new WebInspector.VisualStyleNumberInputBox("animation-iteration-count", WebInspector.UIString("Iterations"), this._keywords.defaults.concat(["Infinite"]), null);
+ animationIterationCount.optionalProperty = true;
</ins><span class="cx">
</span><del>- animationTimingRow.element.appendChild(properties.animationTiming.element);
- animationTimingRow.element.appendChild(properties.animationIterationCount.element);
</del><ins>+ animationTimingRow.element.appendChild(animationTiming.element);
+ animationTimingRow.element.appendChild(animationIterationCount.element);
</ins><span class="cx">
</span><span class="cx"> let animationDurationRow = new WebInspector.DetailsSectionRow;
</span><span class="cx">
</span><span class="cx"> let animationTimeKeywords = ["s", "ms"];
</span><del>- properties.animationDuration = new WebInspector.VisualStyleNumberInputBox("animation-duration", WebInspector.UIString("Duration"), null, animationTimeKeywords);
- properties.animationDelay = new WebInspector.VisualStyleNumberInputBox("animation-delay", WebInspector.UIString("Delay"), null, animationTimeKeywords);
</del><ins>+ let animationDuration = new WebInspector.VisualStyleNumberInputBox("animation-duration", WebInspector.UIString("Duration"), null, animationTimeKeywords);
+ animationDuration.optionalProperty = true;
+ let animationDelay = new WebInspector.VisualStyleNumberInputBox("animation-delay", WebInspector.UIString("Delay"), null, animationTimeKeywords);
+ animationDelay.optionalProperty = true;
</ins><span class="cx">
</span><del>- animationDurationRow.element.appendChild(properties.animationDuration.element);
- animationDurationRow.element.appendChild(properties.animationDelay.element);
</del><ins>+ animationDurationRow.element.appendChild(animationDuration.element);
+ animationDurationRow.element.appendChild(animationDelay.element);
</ins><span class="cx">
</span><span class="cx"> let animationDirectionRow = new WebInspector.DetailsSectionRow;
</span><span class="cx">
</span><del>- properties.animationDirection = new WebInspector.VisualStyleKeywordPicker("animation-direction", WebInspector.UIString("Direction"), {
</del><ins>+ let animationDirection = new WebInspector.VisualStyleKeywordPicker("animation-direction", WebInspector.UIString("Direction"), {
</ins><span class="cx"> basic: this._keywords.normal.concat(["Reverse"]),
</span><span class="cx"> advanced: ["Alternate", "Alternate Reverse"]
</span><span class="cx"> });
</span><del>- properties.animationFillMode = new WebInspector.VisualStyleKeywordPicker("animation-fill-mode", WebInspector.UIString("Fill Mode"), this._keywords.defaults.concat(["None", "Forwards", "Backwards", "Both"]));
</del><ins>+ animationDirection.optionalProperty = true;
+ let animationFillMode = new WebInspector.VisualStyleKeywordPicker("animation-fill-mode", WebInspector.UIString("Fill Mode"), this._keywords.defaults.concat(["None", "Forwards", "Backwards", "Both"]));
+ animationFillMode.optionalProperty = true;
</ins><span class="cx">
</span><del>- animationDirectionRow.element.appendChild(properties.animationDirection.element);
- animationDirectionRow.element.appendChild(properties.animationFillMode.element);
</del><ins>+ animationDirectionRow.element.appendChild(animationDirection.element);
+ animationDirectionRow.element.appendChild(animationFillMode.element);
</ins><span class="cx">
</span><span class="cx"> let animationStateRow = new WebInspector.DetailsSectionRow;
</span><span class="cx">
</span><del>- properties.animationPlayState = new WebInspector.VisualStyleKeywordIconList("animation-play-state", WebInspector.UIString("State"), ["Running", "Paused", "Initial"]);
</del><ins>+ let animationPlayState = new WebInspector.VisualStyleKeywordIconList("animation-play-state", WebInspector.UIString("State"), ["Running", "Paused", "Initial"]);
+ animationPlayState.optionalProperty = true;
</ins><span class="cx">
</span><del>- animationStateRow.element.appendChild(properties.animationPlayState.element);
</del><ins>+ animationStateRow.element.appendChild(animationPlayState.element);
</ins><span class="cx">
</span><del>- let animationGroup = new WebInspector.DetailsSectionGroup([animationNameRow, animationTimingRow, animationDurationRow, animationDirectionRow, animationStateRow]);
</del><ins>+ let animationProperties = [animationName, animationDuration, animationTiming, animationDelay, animationIterationCount, animationDirection, animationFillMode, animationPlayState];
+ let animationPropertyCombiner = new WebInspector.VisualStylePropertyCombiner("animation", animationProperties);
+
+ let noRemainingCommaSeparatedEditorItems = this._noRemainingCommaSeparatedEditorItems.bind(this, animationPropertyCombiner, animationProperties);
+ properties.animation.addEventListener(WebInspector.VisualStyleCommaSeparatedKeywordEditor.Event.NoRemainingTreeItems, noRemainingCommaSeparatedEditorItems, this);
+
+ let selectedCommaSeparatedEditorItemValueChanged = this._selectedCommaSeparatedEditorItemValueChanged.bind(this, properties.animation, animationPropertyCombiner);
+ animationPropertyCombiner.addEventListener(WebInspector.VisualStylePropertyEditor.Event.ValueDidChange, selectedCommaSeparatedEditorItemValueChanged, this);
+
+ let commaSeparatedEditorTreeItemSelected = this._commaSeparatedEditorTreeItemSelected.bind(animationPropertyCombiner);
+ properties.animation.addEventListener(WebInspector.VisualStyleCommaSeparatedKeywordEditor.Event.TreeItemSelected, commaSeparatedEditorTreeItemSelected, this);
+
+ group.specifiedWidthProperties = [properties.animation];
+
+ let animationGroup = new WebInspector.DetailsSectionGroup([animationRow, animationNameRow, animationTimingRow, animationDurationRow, animationDirectionRow, animationStateRow]);
</ins><span class="cx"> this._populateSection(group, [animationGroup]);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>