<!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>[193341] 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/193341">193341</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2015-12-03 11:12:31 -0800 (Thu, 03 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/192784">r192784</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="#branchessafari601branchSourceWebInspectorUIUserInterfaceModelsDOMNodeStylesjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/DOMNodeStyles.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsCSSStyleDeclarationSectionjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationSection.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsRulesStyleDetailsPaneljs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/RulesStyleDetailsPanel.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsVisualStyleSelectorSectionjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/VisualStyleSelectorSection.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 (193340 => 193341)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 19:12:26 UTC (rev 193340)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 19:12:31 UTC (rev 193341)
</span><span class="lines">@@ -1,5 +1,35 @@
</span><span class="cx"> 2015-12-03 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Merge r192784. rdar://problem/23221163
+
+ 2015-11-28 Devin Rousso <dcrousso+webkit@gmail.com>
+
+ Web Inspector: REGRESSION: "Duplicate Selector" context menu item doesn't work
+ https://bugs.webkit.org/show_bug.cgi?id=151628
+
+ Reviewed by Brian Burg.
+
+ Merged the two "add rule" functions inside DOMNodeStyles to create a
+ new rule with the given selector and use the generated best selector
+ for that node otherwise. This also preserves all fallbacks across all
+ functions for creating new CSS rules.
+
+ * UserInterface/Models/DOMNodeStyles.js:
+ (WebInspector.DOMNodeStyles.prototype.addEmptyRule): Deleted.
+ (WebInspector.DOMNodeStyles.prototype.addRuleWithSelector): Deleted.
+ (WebInspector.DOMNodeStyles.prototype.addRule):
+ Creates a new CSS rule using either the provided selector or the best
+ selector for the current node.
+
+ * UserInterface/Views/CSSStyleDeclarationSection.js:
+ (WebInspector.CSSStyleDeclarationSection.prototype._handleContextMenuEvent):
+ * UserInterface/Views/RulesStyleDetailsPanel.js:
+ (WebInspector.RulesStyleDetailsPanel.prototype.newRuleButtonClicked):
+ * UserInterface/Views/VisualStyleSelectorSection.js:
+ (WebInspector.VisualStyleSelectorSection.prototype._addNewRule):
+
+2015-12-03 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Merge r192771. rdar://problem/23221163
</span><span class="cx">
</span><span class="cx"> 2015-11-24 Brian Burg <bburg@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceModelsDOMNodeStylesjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/DOMNodeStyles.js (193340 => 193341)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/DOMNodeStyles.js 2015-12-03 19:12:26 UTC (rev 193340)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/DOMNodeStyles.js 2015-12-03 19:12:31 UTC (rev 193341)
</span><span class="lines">@@ -223,7 +223,7 @@
</span><span class="cx"> CSSAgent.getComputedStyleForNode.invoke({nodeId: this._node.id}, fetchedComputedStyle.bind(this));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- addEmptyRule()
</del><ins>+ addRule(selector)
</ins><span class="cx"> {
</span><span class="cx"> function addedRule(error, rulePayload)
</span><span class="cx"> {
</span><span class="lines">@@ -235,7 +235,8 @@
</span><span class="cx"> this.refresh();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- var selector = this._node.appropriateSelectorFor(true);
</del><ins>+ if (!selector)
+ selector = this._node.appropriateSelectorFor(true);
</ins><span class="cx">
</span><span class="cx"> // COMPATIBILITY (iOS 9): Before CSS.createStyleSheet, CSS.addRule could be called with a contextNode.
</span><span class="cx"> if (!CSSAgent.createStyleSheet) {
</span><span class="lines">@@ -251,24 +252,6 @@
</span><span class="cx"> WebInspector.cssStyleManager.preferredInspectorStyleSheetForFrame(this._node.frame, inspectorStyleSheetAvailable.bind(this));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- addRuleWithSelector(selector)
- {
- if (!selector)
- return;
-
- function addedRule(error, rulePayload)
- {
- if (error)
- return;
-
- DOMAgent.markUndoableState();
-
- this.refresh();
- }
-
- CSSAgent.addRule.invoke({contextNodeId: this._node.id, selector}, addedRule.bind(this));
- }
-
</del><span class="cx"> get matchedRules()
</span><span class="cx"> {
</span><span class="cx"> return this._matchedRules;
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsCSSStyleDeclarationSectionjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationSection.js (193340 => 193341)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationSection.js 2015-12-03 19:12:26 UTC (rev 193340)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationSection.js 2015-12-03 19:12:31 UTC (rev 193341)
</span><span class="lines">@@ -438,7 +438,7 @@
</span><span class="cx"> if (this._delegate && typeof this._delegate.cssStyleDeclarationSectionFocusNextNewInspectorRule === "function")
</span><span class="cx"> this._delegate.cssStyleDeclarationSectionFocusNextNewInspectorRule();
</span><span class="cx">
</span><del>- this._style.nodeStyles.addRuleWithSelector(this._currentSelectorText);
</del><ins>+ this._style.nodeStyles.addRule(this._currentSelectorText);
</ins><span class="cx"> }.bind(this));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsRulesStyleDetailsPaneljs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/RulesStyleDetailsPanel.js (193340 => 193341)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/RulesStyleDetailsPanel.js 2015-12-03 19:12:26 UTC (rev 193340)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/RulesStyleDetailsPanel.js 2015-12-03 19:12:31 UTC (rev 193341)
</span><span class="lines">@@ -392,7 +392,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> this._focusNextNewInspectorRule = true;
</span><del>- this.nodeStyles.addEmptyRule();
</del><ins>+ this.nodeStyles.addRule();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Protected
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsVisualStyleSelectorSectionjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/VisualStyleSelectorSection.js (193340 => 193341)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/VisualStyleSelectorSection.js 2015-12-03 19:12:26 UTC (rev 193340)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/VisualStyleSelectorSection.js 2015-12-03 19:12:31 UTC (rev 193341)
</span><span class="lines">@@ -240,7 +240,7 @@
</span><span class="cx"> if (!this._nodeStyles)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- this._nodeStyles.addEmptyRule();
</del><ins>+ this._nodeStyles.addRule();
</ins><span class="cx"> this._focusNextNewInspectorRule = true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>