<!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>[193258] 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/193258">193258</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2015-12-03 11:02:48 -0800 (Thu, 03 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/191187">r191187</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="#branchessafari601branchSourceWebInspectorUIUserInterfaceModelsCSSCompletionsjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/CSSCompletions.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceModelsCSSKeywordCompletionsjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/CSSKeywordCompletions.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsVisualStyleDetailsPaneljs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/VisualStyleDetailsPanel.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 (193257 => 193258)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 19:02:43 UTC (rev 193257)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 19:02:48 UTC (rev 193258)
</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 r191187. rdar://problem/23221163
+
+ 2015-10-16 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Add "unset" to CSS value autocompletion
+ https://bugs.webkit.org/show_bug.cgi?id=127616
+
+ Reviewed by Brian Burg.
+
+ * UserInterface/Models/CSSCompletions.js:
+ * UserInterface/Models/CSSKeywordCompletions.js:
+ (WebInspector.CSSKeywordCompletions.forProperty):
+ Treat "unset" similiar to "initial". Also, no need for "initial"
+ in an individual property's list. We always include it.
+
+ * UserInterface/Views/VisualStyleDetailsPanel.js:
+ (WebInspector.VisualStyleDetailsPanel):
+ (WebInspector.VisualStyleDetailsPanel.prototype._populateDisplaySection):
+ (WebInspector.VisualStyleDetailsPanel.prototype._populateAlignmentSection):
+ Add "Unset" alongside "Initial".
+
+2015-12-02 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Merge r191071. rdar://problem/23221163
</span><span class="cx">
</span><span class="cx"> 2015-10-13 João Oliveira <hello@jxs.pt>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceModelsCSSCompletionsjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/CSSCompletions.js (193257 => 193258)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/CSSCompletions.js 2015-12-03 19:02:43 UTC (rev 193257)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/CSSCompletions.js 2015-12-03 19:02:48 UTC (rev 193258)
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> var propertyNamesForCodeMirror = {};
</span><del>- var valueKeywordsForCodeMirror = {"inherit": true, "initial": true};
</del><ins>+ var valueKeywordsForCodeMirror = {"inherit": true, "initial": true, "unset": true};
</ins><span class="cx"> var colorKeywordsForCodeMirror = {};
</span><span class="cx">
</span><span class="cx"> function nameForCodeMirror(name)
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceModelsCSSKeywordCompletionsjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/CSSKeywordCompletions.js (193257 => 193258)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/CSSKeywordCompletions.js 2015-12-03 19:02:43 UTC (rev 193257)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/CSSKeywordCompletions.js 2015-12-03 19:02:48 UTC (rev 193258)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.CSSKeywordCompletions.forProperty = function(propertyName)
</span><span class="cx"> {
</span><del>- var acceptedKeywords = ["initial"];
</del><ins>+ var acceptedKeywords = ["initial", "unset"];
</ins><span class="cx"> var isNotPrefixed = propertyName.charAt(0) !== "-";
</span><span class="cx">
</span><span class="cx"> if (propertyName in WebInspector.CSSKeywordCompletions._propertyKeywordMap)
</span><span class="lines">@@ -956,7 +956,7 @@
</span><span class="cx"> "sideways", "sideways-right", "vertical-right", "upright"
</span><span class="cx"> ],
</span><span class="cx"> "-webkit-line-box-contain": [
</span><del>- "block", "inline", "font", "glyphs", "replaced", "inline-box", "none", "initial"
</del><ins>+ "block", "inline", "font", "glyphs", "replaced", "inline-box", "none"
</ins><span class="cx"> ],
</span><span class="cx"> "-webkit-font-feature-settings": [
</span><span class="cx"> "normal"
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsVisualStyleDetailsPaneljs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/VisualStyleDetailsPanel.js (193257 => 193258)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/VisualStyleDetailsPanel.js 2015-12-03 19:02:43 UTC (rev 193257)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/VisualStyleDetailsPanel.js 2015-12-03 19:02:48 UTC (rev 193258)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> this._autocompletionPropertyEditors = {};
</span><span class="cx">
</span><span class="cx"> // These keywords, as well as the values below, are not localized as they must match the CSS spec.
</span><del>- this._keywords.defaults = ["Inherit", "Initial"];
</del><ins>+ this._keywords.defaults = ["Inherit", "Initial", "Unset"];
</ins><span class="cx"> this._keywords.boxModel = this._keywords.defaults.concat(["Auto"]);
</span><span class="cx"> this._keywords.borderStyle = {
</span><span class="cx"> basic: this._keywords.defaults.concat(["None", "Hidden", "Solid"]),
</span><span class="lines">@@ -333,7 +333,7 @@
</span><span class="cx">
</span><span class="cx"> properties.opacity = new WebInspector.VisualStyleUnitSlider("opacity", WebInspector.UIString("Opacity"));
</span><span class="cx"> properties.overflow = new WebInspector.VisualStyleKeywordPicker(["overflow-x", "overflow-y"], WebInspector.UIString("Overflow"), {
</span><del>- basic: ["Initial", "Auto", "Hidden", "Scroll", "Visible"],
</del><ins>+ basic: ["Initial", "Unset", "Auto", "Hidden", "Scroll", "Visible"],
</ins><span class="cx"> advanced: ["Marquee", "Overlay", " WebKit Paged X", " WebKit Paged Y"]
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -581,7 +581,7 @@
</span><span class="cx"> {
</span><span class="cx"> var group = this._groups.alignment;
</span><span class="cx"> var properties = group.properties;
</span><del>- var alignmentKeywords = ["Initial", "Auto", "Flex Start", "Flex End", "Center", "Stretch"];
</del><ins>+ var alignmentKeywords = ["Initial", "Unset", "Auto", "Flex Start", "Flex End", "Center", "Stretch"];
</ins><span class="cx"> var advancedAlignmentKeywords = ["Start", "End", "Left", "Right", "Baseline", "Last Baseline"];
</span><span class="cx">
</span><span class="cx"> var contentRow = new WebInspector.DetailsSectionRow;
</span></span></pre>
</div>
</div>
</body>
</html>