<!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>[193025] 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/193025">193025</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2015-12-03 10:32:39 -0800 (Thu, 03 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/187450">r187450</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="#branchessafari601branchSourceWebInspectorUIUserInterfaceControllersDOMTreeManagerjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/DOMTreeManager.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsCSSStyleDeclarationSectionjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationSection.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 (193024 => 193025)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:32:33 UTC (rev 193024)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:32:39 UTC (rev 193025)
</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 r187450. rdar://problem/23221163
+
+ 2015-07-27 Devin Rousso <drousso@apple.com>
+
+ Web Inspector: support live editing of rule selectors
+ https://bugs.webkit.org/show_bug.cgi?id=139153
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Controllers/DOMTreeManager.js:
+ (WebInspector.DOMTreeManager.prototype.highlightSelector):
+ Moved from CSSStyleDeclarationSection.
+
+ * UserInterface/Views/CSSStyleDeclarationSection.js:
+ (WebInspector.CSSStyleDeclarationSection):
+ (WebInspector.CSSStyleDeclarationSection.prototype.get _currentSelectorText):
+ Returns the current selector text, either from the style ownerRule or the selector element text.
+ (WebInspector.CSSStyleDeclarationSection.prototype._highlightNodesWithSelector):
+ Now highlights all nodes matching the current selector instead of the ownerRule's selector.
+ (WebInspector.CSSStyleDeclarationSection.prototype._hideDOMNodeHighlight):
+ (WebInspector.CSSStyleDeclarationSection.prototype._handleMouseOver):
+ (WebInspector.CSSStyleDeclarationSection.prototype._handleMouseOut):
+ (WebInspector.CSSStyleDeclarationSection.prototype._handleKeyDown):
+ If the character is not a tab, highlight all nodes matching the current selector text.
+ (WebInspector.CSSStyleDeclarationSection.prototype._handleKeyUp):
+ (WebInspector.CSSStyleDeclarationSection.prototype._hideHighlightOnNodesWithSelector): Deleted.
+
+2015-12-01 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Merge r187434. rdar://problem/23221163
</span><span class="cx">
</span><span class="cx"> 2015-07-27 Nikita Vasilyev <nvasilyev@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceControllersDOMTreeManagerjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/DOMTreeManager.js (193024 => 193025)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/DOMTreeManager.js 2015-12-03 18:32:33 UTC (rev 193024)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/DOMTreeManager.js 2015-12-03 18:32:39 UTC (rev 193025)
</span><span class="lines">@@ -360,6 +360,14 @@
</span><span class="cx"> DOMAgent.hideHighlight();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ highlightSelector(selectorText, frameId, mode)
+ {
+ if (!DOMAgent.highlightSelector || typeof DOMAgent.highlightSelector !== "function")
+ return;
+
+ DOMAgent.highlightSelector(this._buildHighlightConfig(mode), selectorText, frameId);
+ }
+
</ins><span class="cx"> highlightRect(rect, usePageCoordinates)
</span><span class="cx"> {
</span><span class="cx"> DOMAgent.highlightRect.invoke({
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsCSSStyleDeclarationSectionjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationSection.js (193024 => 193025)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationSection.js 2015-12-03 18:32:33 UTC (rev 193024)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationSection.js 2015-12-03 18:32:39 UTC (rev 193025)
</span><span class="lines">@@ -48,9 +48,10 @@
</span><span class="cx"> this._selectorElement = document.createElement("span");
</span><span class="cx"> this._selectorElement.className = "selector";
</span><span class="cx"> this._selectorElement.setAttribute("spellcheck", "false");
</span><del>- this._selectorElement.addEventListener("mouseover", this._highlightNodesWithSelector.bind(this));
- this._selectorElement.addEventListener("mouseout", this._hideHighlightOnNodesWithSelector.bind(this));
</del><ins>+ this._selectorElement.addEventListener("mouseover", this._handleMouseOver.bind(this));
+ this._selectorElement.addEventListener("mouseout", this._handleMouseOut.bind(this));
</ins><span class="cx"> this._selectorElement.addEventListener("keydown", this._handleKeyDown.bind(this));
</span><ins>+ this._selectorElement.addEventListener("keyup", this._handleKeyUp.bind(this));
</ins><span class="cx"> this._headerElement.appendChild(this._selectorElement);
</span><span class="cx">
</span><span class="cx"> this._originElement = document.createElement("span");
</span><span class="lines">@@ -384,6 +385,18 @@
</span><span class="cx">
</span><span class="cx"> // Private
</span><span class="cx">
</span><ins>+ get _currentSelectorText()
+ {
+ if (!this._style.ownerRule)
+ return;
+
+ var selectorText = this._selectorElement.textContent;
+ if (!selectorText || !selectorText.length)
+ selectorText = this._style.ownerRule.selectorText;
+
+ return selectorText.trim();
+ },
+
</ins><span class="cx"> _handleContextMenuEvent: function(event)
</span><span class="cx"> {
</span><span class="cx"> if (window.getSelection().toString().length)
</span><span class="lines">@@ -444,33 +457,35 @@
</span><span class="cx">
</span><span class="cx"> _highlightNodesWithSelector: function()
</span><span class="cx"> {
</span><del>- var highlightConfig = {
- borderColor: {r: 255, g: 229, b: 153, a: 0.66},
- contentColor: {r: 111, g: 168, b: 220, a: 0.66},
- marginColor: {r: 246, g: 178, b: 107, a: 0.66},
- paddingColor: {r: 147, g: 196, b: 125, a: 0.66},
- showInfo: true
- };
-
</del><span class="cx"> if (!this._style.ownerRule) {
</span><del>- // COMPATIBILITY (iOS 6): Order of parameters changed in iOS 7.
- DOMAgent.highlightNode.invoke({nodeId: this._style.node.id, highlightConfig});
</del><ins>+ WebInspector.domTreeManager.highlightDOMNode(this._style.node.id);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (DOMAgent.highlightSelector)
- DOMAgent.highlightSelector(highlightConfig, this._style.ownerRule.selectorText, this._style.node.ownerDocument.frameIdentifier);
</del><ins>+ WebInspector.domTreeManager.highlightSelector(this._currentSelectorText, this._style.node.ownerDocument.frameIdentifier);
</ins><span class="cx"> },
</span><span class="cx">
</span><del>- _hideHighlightOnNodesWithSelector: function()
</del><ins>+ _hideDOMNodeHighlight: function()
</ins><span class="cx"> {
</span><del>- DOMAgent.hideHighlight();
</del><ins>+ WebInspector.domTreeManager.hideDOMNodeHighlight();
</ins><span class="cx"> },
</span><span class="cx">
</span><ins>+ _handleMouseOver: function(event)
+ {
+ this._highlightNodesWithSelector();
+ },
+
+ _handleMouseOut: function(event)
+ {
+ this._hideDOMNodeHighlight();
+ },
+
</ins><span class="cx"> _handleKeyDown: function(event)
</span><span class="cx"> {
</span><del>- if (event.keyCode !== 9)
</del><ins>+ if (event.keyCode !== 9) {
+ this._highlightNodesWithSelector();
</ins><span class="cx"> return;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> if (event.shiftKey && this._delegate && typeof this._delegate.cssStyleDeclarationSectionEditorPreviousRule === "function") {
</span><span class="cx"> event.preventDefault();
</span><span class="lines">@@ -486,6 +501,11 @@
</span><span class="cx"> }
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ _handleKeyUp: function(event)
+ {
+ this._highlightNodesWithSelector();
+ },
+
</ins><span class="cx"> _commitSelector: function(mutations)
</span><span class="cx"> {
</span><span class="cx"> console.assert(this._style.ownerRule);
</span></span></pre>
</div>
</div>
</body>
</html>