<!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>[201890] 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/201890">201890</a></dd>
<dt>Author</dt> <dd>nvasilyev@apple.com</dd>
<dt>Date</dt> <dd>2016-06-09 15:49:28 -0700 (Thu, 09 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/194717">r194717</a>): Web Inspector: Elements tab: an element loses focus when selected by Up/Down key
https://bugs.webkit.org/show_bug.cgi?id=157768
<rdar://problem/26311155>
Reviewed by Timothy Hatcher.
Remove _previousFocusedSection and _newInspectorRuleSelector since it was used only
to focus on a newly created section (added by clicking on "+" button).
Introduce _inspectorSection and _isInspectorSectionPendingFocus.
* UserInterface/Views/CSSStyleDeclarationSection.js:
(WebInspector.CSSStyleDeclarationSection.prototype.cssStyleDeclarationTextEditorBlurActiveEditor): Deleted.
(WebInspector.CSSStyleDeclarationSection.prototype._handleSelectorPaste): Deleted.
No longer needed, it was only used by _previousFocusedSection and _newInspectorRuleSelector.
* UserInterface/Views/CSSStyleDeclarationTextEditor.js:
(WebInspector.CSSStyleDeclarationTextEditor.): Deleted.
No londer needed, it was only used by _previousFocusedSection.
* UserInterface/Views/RulesStyleDetailsPanel.js:
(WebInspector.RulesStyleDetailsPanel):
(WebInspector.RulesStyleDetailsPanel.prototype.refresh.appendStyleSection):
(WebInspector.RulesStyleDetailsPanel.prototype.newRuleButtonClicked):
(WebInspector.RulesStyleDetailsPanel.prototype.nodeStylesRefreshed):
(WebInspector.RulesStyleDetailsPanel.prototype.cssStyleDeclarationSectionEditorFocused): Deleted.
(WebInspector.RulesStyleDetailsPanel.prototype.cssStyleDeclarationSectionBlurActiveEditor): Deleted.
(WebInspector.RulesStyleDetailsPanel.prototype.cssStyleDeclarationSectionFocusNewInspectorRuleWithSelector): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</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>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsRulesStyleDetailsPaneljs">trunk/Source/WebInspectorUI/UserInterface/Views/RulesStyleDetailsPanel.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (201889 => 201890)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog        2016-06-09 22:34:41 UTC (rev 201889)
+++ trunk/Source/WebInspectorUI/ChangeLog        2016-06-09 22:49:28 UTC (rev 201890)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2016-06-09 Nikita Vasilyev <nvasilyev@apple.com>
+
+ REGRESSION (r194717): Web Inspector: Elements tab: an element loses focus when selected by Up/Down key
+ https://bugs.webkit.org/show_bug.cgi?id=157768
+ <rdar://problem/26311155>
+
+ Reviewed by Timothy Hatcher.
+
+ Remove _previousFocusedSection and _newInspectorRuleSelector since it was used only
+ to focus on a newly created section (added by clicking on "+" button).
+
+ Introduce _inspectorSection and _isInspectorSectionPendingFocus.
+
+ * UserInterface/Views/CSSStyleDeclarationSection.js:
+ (WebInspector.CSSStyleDeclarationSection.prototype.cssStyleDeclarationTextEditorBlurActiveEditor): Deleted.
+ (WebInspector.CSSStyleDeclarationSection.prototype._handleSelectorPaste): Deleted.
+ No longer needed, it was only used by _previousFocusedSection and _newInspectorRuleSelector.
+
+ * UserInterface/Views/CSSStyleDeclarationTextEditor.js:
+ (WebInspector.CSSStyleDeclarationTextEditor.): Deleted.
+ No londer needed, it was only used by _previousFocusedSection.
+
+ * UserInterface/Views/RulesStyleDetailsPanel.js:
+ (WebInspector.RulesStyleDetailsPanel):
+ (WebInspector.RulesStyleDetailsPanel.prototype.refresh.appendStyleSection):
+ (WebInspector.RulesStyleDetailsPanel.prototype.newRuleButtonClicked):
+ (WebInspector.RulesStyleDetailsPanel.prototype.nodeStylesRefreshed):
+ (WebInspector.RulesStyleDetailsPanel.prototype.cssStyleDeclarationSectionEditorFocused): Deleted.
+ (WebInspector.RulesStyleDetailsPanel.prototype.cssStyleDeclarationSectionBlurActiveEditor): Deleted.
+ (WebInspector.RulesStyleDetailsPanel.prototype.cssStyleDeclarationSectionFocusNewInspectorRuleWithSelector): Deleted.
+
</ins><span class="cx"> 2016-06-08 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION: Web Inspector: Should be able to evaluate "{a:1, b:2}" in the console
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsCSSStyleDeclarationSectionjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationSection.js (201889 => 201890)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationSection.js        2016-06-09 22:34:41 UTC (rev 201889)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationSection.js        2016-06-09 22:49:28 UTC (rev 201890)
</span><span class="lines">@@ -324,12 +324,6 @@
</span><span class="cx"> this._delegate.cssStyleDeclarationSectionEditorFocused(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- cssStyleDeclarationTextEditorBlurActiveEditor()
- {
- if (typeof this._delegate.cssStyleDeclarationSectionBlurActiveEditor === "function")
- this._delegate.cssStyleDeclarationSectionBlurActiveEditor(this);
- }
-
</del><span class="cx"> cssStyleDeclarationTextEditorSwitchRule(reverse)
</span><span class="cx"> {
</span><span class="cx"> if (!this._delegate)
</span><span class="lines">@@ -458,9 +452,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (this._delegate && typeof this._delegate.cssStyleDeclarationSectionFocusNewInspectorRuleWithSelector === "function")
- this._delegate.cssStyleDeclarationSectionFocusNewInspectorRuleWithSelector(this._currentSelectorText);
-
</del><span class="cx"> this._style.nodeStyles.addRule(this._currentSelectorText);
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -486,9 +477,6 @@
</span><span class="cx"> else
</span><span class="cx"> selector = this._currentSelectorText + pseudoClassSelector;
</span><span class="cx">
</span><del>- if (this._delegate && typeof this._delegate.cssStyleDeclarationSectionFocusNewInspectorRuleWithSelector === "function")
- this._delegate.cssStyleDeclarationSectionFocusNewInspectorRuleWithSelector(selector);
-
</del><span class="cx"> this._style.nodeStyles.addRule(selector);
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -524,9 +512,6 @@
</span><span class="cx"> else
</span><span class="cx"> selector = this._currentSelectorText + pseudoElementSelector;
</span><span class="cx">
</span><del>- if (this._delegate && typeof this._delegate.cssStyleDeclarationSectionFocusNewInspectorRuleWithSelector === "function")
- this._delegate.cssStyleDeclarationSectionFocusNewInspectorRuleWithSelector(selector);
-
</del><span class="cx"> this._style.nodeStyles.addRule(selector, styleText);
</span><span class="cx"> });
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsCSSStyleDeclarationTextEditorjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationTextEditor.js (201889 => 201890)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationTextEditor.js        2016-06-09 22:34:41 UTC (rev 201889)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationTextEditor.js        2016-06-09 22:49:28 UTC (rev 201890)
</span><span class="lines">@@ -859,7 +859,6 @@
</span><span class="cx"> {
</span><span class="cx"> function createSwatch(swatch, marker, valueObject, valueString)
</span><span class="cx"> {
</span><del>- swatch.addEventListener(WebInspector.InlineSwatch.Event.BeforeClicked, this._inlineSwatchBeforeClicked, this);
</del><span class="cx"> swatch.addEventListener(WebInspector.InlineSwatch.Event.ValueChanged, this._inlineSwatchValueChanged, this);
</span><span class="cx">
</span><span class="cx"> let codeMirrorTextMarker = marker.codeMirrorTextMarker;
</span><span class="lines">@@ -1291,12 +1290,6 @@
</span><span class="cx"> this._codeMirror.operation(update.bind(this));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- _inlineSwatchBeforeClicked(event)
- {
- if (this._delegate && typeof this._delegate.cssStyleDeclarationTextEditorBlurActiveEditor === "function")
- this._delegate.cssStyleDeclarationTextEditorBlurActiveEditor();
- }
-
</del><span class="cx"> _inlineSwatchValueChanged(event)
</span><span class="cx"> {
</span><span class="cx"> let swatch = event && event.target;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsRulesStyleDetailsPaneljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/RulesStyleDetailsPanel.js (201889 => 201890)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/RulesStyleDetailsPanel.js        2016-06-09 22:34:41 UTC (rev 201889)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/RulesStyleDetailsPanel.js        2016-06-09 22:49:28 UTC (rev 201890)
</span><span class="lines">@@ -30,7 +30,8 @@
</span><span class="cx"> super(delegate, "rules", "rules", WebInspector.UIString("Styles \u2014 Rules"));
</span><span class="cx">
</span><span class="cx"> this._sections = [];
</span><del>- this._previousFocusedSection = null;
</del><ins>+ this._inspectorSection = null;
+ this._isInspectorSectionPendingFocus = false;
</ins><span class="cx"> this._ruleMediaAndInherticanceList = [];
</span><span class="cx"> this._propertyToSelectAndHighlight = null;
</span><span class="cx">
</span><span class="lines">@@ -144,8 +145,6 @@
</span><span class="cx"> function appendStyleSection(style)
</span><span class="cx"> {
</span><span class="cx"> var section = style.__rulesSection;
</span><del>- if (section && section.focused && !this._previousFocusedSection)
- this._previousFocusedSection = section;
</del><span class="cx">
</span><span class="cx"> if (!section) {
</span><span class="cx"> section = new WebInspector.CSSStyleDeclarationSection(this, style);
</span><span class="lines">@@ -153,10 +152,8 @@
</span><span class="cx"> } else
</span><span class="cx"> section.refresh();
</span><span class="cx">
</span><del>- if (style.isInspectorRule() && this._newInspectorRuleSelector === style.selectorText && !style.hasProperties()) {
- this._previousFocusedSection = section;
- this._newInspectorRuleSelector = null;
- }
</del><ins>+ if (this._isInspectorSectionPendingFocus && style.isInspectorRule())
+ this._inspectorSection = section;
</ins><span class="cx">
</span><span class="cx"> // Reset lastInGroup in case the order/grouping changed.
</span><span class="cx"> section.lastInGroup = false;
</span><span class="lines">@@ -317,12 +314,10 @@
</span><span class="cx"> if (section !== focusedSection)
</span><span class="cx"> section.clearSelection();
</span><span class="cx"> }
</span><del>- this._previousFocusedSection = focusedSection;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> cssStyleDeclarationSectionBlurActiveEditor()
</span><span class="cx"> {
</span><del>- this._previousFocusedSection = null;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> cssStyleDeclarationSectionEditorNextRule(currentSection)
</span><span class="lines">@@ -383,11 +378,6 @@
</span><span class="cx"> this.element.classList.toggle("filter-non-matching", !matchFound);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- cssStyleDeclarationSectionFocusNewInspectorRuleWithSelector(selector)
- {
- this._newInspectorRuleSelector = selector;
- }
-
</del><span class="cx"> newRuleButtonClicked()
</span><span class="cx"> {
</span><span class="cx"> if (this.nodeStyles.node.isInShadowTree())
</span><span class="lines">@@ -398,8 +388,9 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- this._newInspectorRuleSelector = this.nodeStyles.node.appropriateSelectorFor(true);
- this.nodeStyles.addRule(this._newInspectorRuleSelector);
</del><ins>+ this._isInspectorSectionPendingFocus = true;
+ let newInspectorRuleSelector = this.nodeStyles.node.appropriateSelectorFor(true);
+ this.nodeStyles.addRule(newInspectorRuleSelector);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sectionForStyle(style)
</span><span class="lines">@@ -461,14 +452,20 @@
</span><span class="cx"> nodeStylesRefreshed(event)
</span><span class="cx"> {
</span><span class="cx"> super.nodeStylesRefreshed(event);
</span><del>-
</del><ins>+
</ins><span class="cx"> if (this._propertyToSelectAndHighlight) {
</span><span class="cx"> this.scrollToSectionAndHighlightProperty(this._propertyToSelectAndHighlight);
</span><span class="cx"> this._propertyToSelectAndHighlight = null;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (this._previousFocusedSection && this._visible)
- this._previousFocusedSection.focus();
</del><ins>+ if (this._isInspectorSectionPendingFocus) {
+ this._isInspectorSectionPendingFocus = false;
+
+ if (this._inspectorSection) {
+ this._inspectorSection.focus();
+ this._inspectorSection = null;
+ }
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Private
</span></span></pre>
</div>
</div>
</body>
</html>