<!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>[188480] 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/188480">188480</a></dd>
<dt>Author</dt> <dd>drousso@apple.com</dd>
<dt>Date</dt> <dd>2015-08-14 11:43:46 -0700 (Fri, 14 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Add autocomplete controller for Visual property editors
https://bugs.webkit.org/show_bug.cgi?id=147579
Reviewed by Timothy Hatcher.
* UserInterface/Controllers/VisualStyleCompletionsController.js: Added.
(WebInspector.VisualStyleCompletionsController):
Takes in a CSSCompletions and displays a list of suggestions based on a given prefix in a popover.
(WebInspector.VisualStyleCompletionsController.prototype.get visible):
(WebInspector.VisualStyleCompletionsController.prototype.get hasCompletions):
(WebInspector.VisualStyleCompletionsController.prototype.get currentCompletion):
(WebInspector.VisualStyleCompletionsController.prototype.set completions):
(WebInspector.VisualStyleCompletionsController.prototype.completionSuggestionsViewCustomizeCompletionElement):
(WebInspector.VisualStyleCompletionsController.prototype.previous):
(WebInspector.VisualStyleCompletionsController.prototype.next):
(WebInspector.VisualStyleCompletionsController.prototype.update):
(WebInspector.VisualStyleCompletionsController.prototype.show):
(WebInspector.VisualStyleCompletionsController.prototype.hide):
* UserInterface/Models/CSSKeywordCompletions.js:
(WebInspector.CSSKeywordCompletions.forProperty):
Make sure that the cssNameCompletions exist before trying to add them.
* UserInterface/Views/CompletionSuggestionsView.js:
(WebInspector.CompletionSuggestionsView.prototype.update):
Allow the delegate to modify the newly created completion suggestion item.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsCSSKeywordCompletionsjs">trunk/Source/WebInspectorUI/UserInterface/Models/CSSKeywordCompletions.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsCompletionSuggestionsViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/CompletionSuggestionsView.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceControllersVisualStyleCompletionsControllerjs">trunk/Source/WebInspectorUI/UserInterface/Controllers/VisualStyleCompletionsController.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (188479 => 188480)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-08-14 18:31:38 UTC (rev 188479)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-08-14 18:43:46 UTC (rev 188480)
</span><span class="lines">@@ -1,5 +1,34 @@
</span><span class="cx"> 2015-08-14 Devin Rousso <drousso@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: Add autocomplete controller for Visual property editors
+ https://bugs.webkit.org/show_bug.cgi?id=147579
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Controllers/VisualStyleCompletionsController.js: Added.
+ (WebInspector.VisualStyleCompletionsController):
+ Takes in a CSSCompletions and displays a list of suggestions based on a given prefix in a popover.
+ (WebInspector.VisualStyleCompletionsController.prototype.get visible):
+ (WebInspector.VisualStyleCompletionsController.prototype.get hasCompletions):
+ (WebInspector.VisualStyleCompletionsController.prototype.get currentCompletion):
+ (WebInspector.VisualStyleCompletionsController.prototype.set completions):
+ (WebInspector.VisualStyleCompletionsController.prototype.completionSuggestionsViewCustomizeCompletionElement):
+ (WebInspector.VisualStyleCompletionsController.prototype.previous):
+ (WebInspector.VisualStyleCompletionsController.prototype.next):
+ (WebInspector.VisualStyleCompletionsController.prototype.update):
+ (WebInspector.VisualStyleCompletionsController.prototype.show):
+ (WebInspector.VisualStyleCompletionsController.prototype.hide):
+
+ * UserInterface/Models/CSSKeywordCompletions.js:
+ (WebInspector.CSSKeywordCompletions.forProperty):
+ Make sure that the cssNameCompletions exist before trying to add them.
+
+ * UserInterface/Views/CompletionSuggestionsView.js:
+ (WebInspector.CompletionSuggestionsView.prototype.update):
+ Allow the delegate to modify the newly created completion suggestion item.
+
+2015-08-14 Devin Rousso <drousso@apple.com>
+
</ins><span class="cx"> Web Inspector: Add a visual editor for timing functions
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=148022
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceControllersVisualStyleCompletionsControllerjs"></a>
<div class="addfile"><h4>Added: trunk/Source/WebInspectorUI/UserInterface/Controllers/VisualStyleCompletionsController.js (0 => 188480)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Controllers/VisualStyleCompletionsController.js (rev 0)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/VisualStyleCompletionsController.js 2015-08-14 18:43:46 UTC (rev 188480)
</span><span class="lines">@@ -0,0 +1,132 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+WebInspector.VisualStyleCompletionsController = class VisualStyleCompletionsController extends WebInspector.Object
+{
+ constructor(delegate)
+ {
+ super();
+
+ this._delegate = delegate || null;
+ this._suggestionsView = new WebInspector.CompletionSuggestionsView(this);
+ this._completions = null;
+ this._currentCompletions = [];
+ this._selectedCompletionIndex = 0;
+ }
+
+ // Public
+
+ get visible()
+ {
+ return this._completions && this._currentCompletions.length && this._suggestionsView.visible;
+ }
+
+ get hasCompletions()
+ {
+ return !!this._completions;
+ }
+
+ get currentCompletion()
+ {
+ if (!this.hasCompletions)
+ return;
+
+ return this._currentCompletions[this._selectedCompletionIndex] || null;
+ }
+
+ set completions(completions)
+ {
+ this._completions = completions || null;
+ }
+
+ completionSuggestionsViewCustomizeCompletionElement(suggestionsView, element, item)
+ {
+ if (this._delegate && typeof this._delegate.visualStyleCompletionsControllerCustomizeCompletionElement === "function")
+ this._delegate.visualStyleCompletionsControllerCustomizeCompletionElement(suggestionsView, element, item);
+ }
+
+ completionSuggestionsClickedCompletion(suggestionsView, text)
+ {
+ suggestionsView.hide();
+ this.dispatchEventToListeners(WebInspector.VisualStyleCompletionsController.Event.CompletionSelected, {text});
+ }
+
+ previous()
+ {
+ this._suggestionsView.selectPrevious();
+ this._selectedCompletionIndex = this._suggestionsView.selectedIndex;
+ }
+
+ next()
+ {
+ this._suggestionsView.selectNext();
+ this._selectedCompletionIndex = this._suggestionsView.selectedIndex;
+ }
+
+ update(value)
+ {
+ if (!this.hasCompletions)
+ return false;
+
+ this._currentCompletions = this._completions.startsWith(value);
+
+ var currentCompletionsLength = this._currentCompletions.length;
+ if (currentCompletionsLength) {
+ if (currentCompletionsLength === 1 && this._currentCompletions[0] === value) {
+ this.hide();
+ return false;
+ }
+
+ if (this._selectedCompletionIndex >= currentCompletionsLength)
+ this._selectedCompletionIndex = 0;
+
+ this._suggestionsView.update(this._currentCompletions, this._selectedCompletionIndex);
+ return true;
+ }
+
+ this.hide();
+ return false;
+ }
+
+ show(bounds, padding)
+ {
+ if (!bounds)
+ return;
+
+ this._suggestionsView.show(bounds.pad(padding || 0));
+ }
+
+ hide()
+ {
+ if (this._suggestionsView.isHandlingClickEvent())
+ return;
+
+ this._suggestionsView.hide();
+ }
+};
+
+WebInspector.VisualStyleCompletionsController.Event = {
+ CompletionSelected: "visual-style-completions-controller-completion-selected"
+}
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsCSSKeywordCompletionsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/CSSKeywordCompletions.js (188479 => 188480)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/CSSKeywordCompletions.js 2015-08-14 18:31:38 UTC (rev 188479)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/CSSKeywordCompletions.js 2015-08-14 18:43:46 UTC (rev 188480)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> else if (isNotPrefixed && ("-webkit-" + propertyName) in WebInspector.CSSKeywordCompletions.InheritedProperties)
</span><span class="cx"> acceptedKeywords.push("inherit");
</span><span class="cx">
</span><del>- if (acceptedKeywords.includes(WebInspector.CSSKeywordCompletions.AllPropertyNamesPlaceholder)) {
</del><ins>+ if (acceptedKeywords.includes(WebInspector.CSSKeywordCompletions.AllPropertyNamesPlaceholder) && WebInspector.CSSCompletions.cssNameCompletions) {
</ins><span class="cx"> acceptedKeywords.remove(WebInspector.CSSKeywordCompletions.AllPropertyNamesPlaceholder);
</span><span class="cx"> acceptedKeywords = acceptedKeywords.concat(WebInspector.CSSCompletions.cssNameCompletions.values);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsCompletionSuggestionsViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/CompletionSuggestionsView.js (188479 => 188480)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/CompletionSuggestionsView.js 2015-08-14 18:31:38 UTC (rev 188479)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/CompletionSuggestionsView.js 2015-08-14 18:43:46 UTC (rev 188480)
</span><span class="lines">@@ -175,6 +175,9 @@
</span><span class="cx"> if (i === this._selectedIndex)
</span><span class="cx"> itemElement.classList.add(WebInspector.CompletionSuggestionsView.SelectedItemStyleClassName);
</span><span class="cx"> this._containerElement.appendChild(itemElement);
</span><ins>+
+ if (this._delegate && typeof this._delegate.completionSuggestionsViewCustomizeCompletionElement === "function")
+ this._delegate.completionSuggestionsViewCustomizeCompletionElement(this, itemElement, completions[i]);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>