<!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>[193046] 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/193046">193046</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2015-12-03 10:35:00 -0800 (Thu, 03 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/187714">r187714</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="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsCSSStyleDeclarationSectionjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationSection.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsCSSStyleDeclarationTextEditorjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationTextEditor.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsRulesStyleDetailsPaneljs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/RulesStyleDetailsPanel.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsStyleDetailsPaneljs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/StyleDetailsPanel.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 (193045 => 193046)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:34:54 UTC (rev 193045)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:35:00 UTC (rev 193046)
</span><span class="lines">@@ -1,5 +1,34 @@
</span><span class="cx"> 2015-12-01 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Merge r187714. rdar://problem/23221163
+
+ 2015-07-31 Devin Rousso <drousso@apple.com>
+
+ Web Inspector: inherited CSS rules disappear from Styles sidebar while editing
+ https://bugs.webkit.org/show_bug.cgi?id=147441
+
+ Reviewed by Timothy Hatcher.
+
+ If the user edits a style declaration such that it would dissapear mid-edit, prevent
+ the rules panel from refreshing until that editor is blurred.
+
+ * UserInterface/Views/CSSStyleDeclarationSection.js:
+ (WebInspector.CSSStyleDeclarationSection):
+ (WebInspector.CSSStyleDeclarationSection.prototype.get editorActive):
+ (WebInspector.CSSStyleDeclarationSection.prototype.get _hasInvalidSelector):
+ (WebInspector.CSSStyleDeclarationSection.prototype._editorContentChanged):
+ (WebInspector.CSSStyleDeclarationSection.prototype._editorBlurred):
+ * UserInterface/Views/CSSStyleDeclarationTextEditor.js:
+ (WebInspector.CSSStyleDeclarationTextEditor.prototype._editorBlured):
+ (WebInspector.CSSStyleDeclarationTextEditor.prototype._contentChanged):
+ * UserInterface/Views/RulesStyleDetailsPanel.js:
+ (WebInspector.RulesStyleDetailsPanel):
+ (WebInspector.RulesStyleDetailsPanel.prototype._removeSectionWithActiveEditor):
+ * UserInterface/Views/StyleDetailsPanel.js:
+ (WebInspector.StyleDetailsPanel.prototype._refreshPreservingScrollPosition):
+
+2015-12-01 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Merge r187708. rdar://problem/23221163
</span><span class="cx">
</span><span class="cx"> 2015-07-31 Devin Rousso <drousso@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsCSSStyleDeclarationSectionjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationSection.js (193045 => 193046)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationSection.js 2015-12-03 18:34:54 UTC (rev 193045)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationSection.js 2015-12-03 18:35:00 UTC (rev 193046)
</span><span class="lines">@@ -62,7 +62,10 @@
</span><span class="cx"> this._propertiesElement = document.createElement("div");
</span><span class="cx"> this._propertiesElement.className = "properties";
</span><span class="cx">
</span><ins>+ this._editorActive = false;
</ins><span class="cx"> this._propertiesTextEditor = new WebInspector.CSSStyleDeclarationTextEditor(this, style);
</span><ins>+ this._propertiesTextEditor.addEventListener(WebInspector.CSSStyleDeclarationTextEditor.Event.ContentChanged, this._editorContentChanged.bind(this));
+ this._propertiesTextEditor.addEventListener(WebInspector.CSSStyleDeclarationTextEditor.Event.Blurred, this._editorBlurred.bind(this));
</ins><span class="cx"> this._propertiesElement.appendChild(this._propertiesTextEditor.element);
</span><span class="cx">
</span><span class="cx"> this._element.appendChild(this._headerElement);
</span><span class="lines">@@ -386,6 +389,11 @@
</span><span class="cx"> return !this._style.editable;
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ get editorActive()
+ {
+ return this._editorActive;
+ },
+
</ins><span class="cx"> // Private
</span><span class="cx">
</span><span class="cx"> get _currentSelectorText()
</span><span class="lines">@@ -585,7 +593,22 @@
</span><span class="cx"> get _hasInvalidSelector()
</span><span class="cx"> {
</span><span class="cx"> return this._element.classList.contains(WebInspector.CSSStyleDeclarationSection.SelectorInvalidClassName);
</span><ins>+ },
+
+ _editorContentChanged: function(event)
+ {
+ this._editorActive = true;
+ },
+
+ _editorBlurred: function(event)
+ {
+ this._editorActive = false;
+ this.dispatchEventToListeners(WebInspector.CSSStyleDeclarationSection.Event.Blurred);
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+WebInspector.CSSStyleDeclarationSection.Event = {
+ Blurred: "css-style-declaration-sections-blurred"
+};
+
</ins><span class="cx"> WebInspector.CSSStyleDeclarationSection.prototype.__proto__ = WebInspector.StyleDetailsPanel.prototype;
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsCSSStyleDeclarationTextEditorjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationTextEditor.js (193045 => 193046)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationTextEditor.js 2015-12-03 18:34:54 UTC (rev 193045)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationTextEditor.js 2015-12-03 18:35:00 UTC (rev 193046)
</span><span class="lines">@@ -744,6 +744,7 @@
</span><span class="cx"> // Reset the content on blur since we stop accepting external changes while the the editor is focused.
</span><span class="cx"> // This causes us to pick up any change that was suppressed while the editor was focused.
</span><span class="cx"> this._resetContent();
</span><ins>+ this.dispatchEventToListeners(WebInspector.CSSStyleDeclarationTextEditor.Event.Blurred);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> _editorFocused(codeMirror)
</span><span class="lines">@@ -779,6 +780,8 @@
</span><span class="cx"> if (this._commitChangesTimeout)
</span><span class="cx"> clearTimeout(this._commitChangesTimeout);
</span><span class="cx"> this._commitChangesTimeout = setTimeout(this._commitChanges.bind(this), delay);
</span><ins>+
+ this.dispatchEventToListeners(WebInspector.CSSStyleDeclarationTextEditor.Event.ContentChanged);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> _updateTextMarkers(nonatomic)
</span><span class="lines">@@ -1671,6 +1674,11 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+WebInspector.CSSStyleDeclarationTextEditor.Event = {
+ ContentChanged: "css-style-declaration-text-editor-content-changed",
+ Blurred: "css-style-declaration-text-editor-blurred"
+};
+
</ins><span class="cx"> WebInspector.CSSStyleDeclarationTextEditor.StyleClassName = "css-style-text-editor";
</span><span class="cx"> WebInspector.CSSStyleDeclarationTextEditor.ReadOnlyStyleClassName = "read-only";
</span><span class="cx"> WebInspector.CSSStyleDeclarationTextEditor.ColorSwatchElementStyleClassName = "color-swatch";
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsRulesStyleDetailsPaneljs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/RulesStyleDetailsPanel.js (193045 => 193046)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/RulesStyleDetailsPanel.js 2015-12-03 18:34:54 UTC (rev 193045)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/RulesStyleDetailsPanel.js 2015-12-03 18:35:00 UTC (rev 193046)
</span><span class="lines">@@ -41,6 +41,8 @@
</span><span class="cx"> this._emptyFilterResultsMessage.classList.add("no-filter-results-message");
</span><span class="cx"> this._emptyFilterResultsMessage.textContent = WebInspector.UIString("No Results Found");
</span><span class="cx"> this._emptyFilterResultsElement.appendChild(this._emptyFilterResultsMessage);
</span><ins>+
+ this._boundRemoveSectionWithActiveEditor = this._removeSectionWithActiveEditor.bind(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Public
</span><span class="lines">@@ -54,6 +56,22 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (!this._forceSignificantChange) {
+ this._sectionWithActiveEditor = null;
+ for (var section of this._sections) {
+ if (!section.editorActive)
+ continue;
+
+ this._sectionWithActiveEditor = section;
+ break;
+ }
+
+ if (this._sectionWithActiveEditor) {
+ this._sectionWithActiveEditor.addEventListener(WebInspector.CSSStyleDeclarationSection.Event.Blurred, this._boundRemoveSectionWithActiveEditor);
+ return;
+ }
+ }
+
</ins><span class="cx"> var newSections = [];
</span><span class="cx"> var newDOMFragment = document.createDocumentFragment();
</span><span class="cx">
</span><span class="lines">@@ -451,4 +469,10 @@
</span><span class="cx"> this._focusNextNewInspectorRule = true;
</span><span class="cx"> this.nodeStyles.addEmptyRule();
</span><span class="cx"> }
</span><ins>+
+ _removeSectionWithActiveEditor(event)
+ {
+ this._sectionWithActiveEditor.removeEventListener(WebInspector.CSSStyleDeclarationSection.Event.Blurred, this._boundRemoveSectionWithActiveEditor);
+ this.refresh(true);
+ }
</ins><span class="cx"> };
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsStyleDetailsPaneljs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/StyleDetailsPanel.js (193045 => 193046)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/StyleDetailsPanel.js 2015-12-03 18:34:54 UTC (rev 193045)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/StyleDetailsPanel.js 2015-12-03 18:35:00 UTC (rev 193046)
</span><span class="lines">@@ -141,7 +141,6 @@
</span><span class="cx"> _refreshPreservingScrollPosition(significantChange)
</span><span class="cx"> {
</span><span class="cx"> significantChange = this._forceSignificantChange || significantChange || false;
</span><del>- delete this._forceSignificantChange;
</del><span class="cx">
</span><span class="cx"> var previousScrollTop = this._initialScrollOffset;
</span><span class="cx">
</span><span class="lines">@@ -155,6 +154,8 @@
</span><span class="cx">
</span><span class="cx"> if (this.element.parentNode)
</span><span class="cx"> this.element.parentNode.scrollTop = previousScrollTop;
</span><ins>+
+ this._forceSignificantChange = false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> _nodeStylesNeedsRefreshed(event)
</span></span></pre>
</div>
</div>
</body>
</html>