<!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>[191416] 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/191416">191416</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-10-21 17:13:29 -0700 (Wed, 21 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Option-Up doesn't increment certain attribute values
https://bugs.webkit.org/show_bug.cgi?id=149257
Patch by Devin Rousso <dcrousso+webkit@gmail.com> on 2015-10-21
Reviewed by Brian Burg.
If the user tries to modify a numerical attribute in HTML and the cursor
was at the beginning of the attribute value, the range of the selection
was within a sibling element instead of the text node containin the value.
This patch fixes this issue and ensures that the correct text is selected.
* UserInterface/Views/EditingSupport.js:
(WebInspector.startEditing.handleEditingResult):
Replaced var with let.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsEditingSupportjs">trunk/Source/WebInspectorUI/UserInterface/Views/EditingSupport.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (191415 => 191416)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-10-22 00:07:27 UTC (rev 191415)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-10-22 00:13:29 UTC (rev 191416)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-10-21 Devin Rousso <dcrousso+webkit@gmail.com>
+
+ Web Inspector: Option-Up doesn't increment certain attribute values
+ https://bugs.webkit.org/show_bug.cgi?id=149257
+
+ Reviewed by Brian Burg.
+
+ If the user tries to modify a numerical attribute in HTML and the cursor
+ was at the beginning of the attribute value, the range of the selection
+ was within a sibling element instead of the text node containin the value.
+ This patch fixes this issue and ensures that the correct text is selected.
+
+ * UserInterface/Views/EditingSupport.js:
+ (WebInspector.startEditing.handleEditingResult):
+ Replaced var with let.
+
</ins><span class="cx"> 2015-10-21 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Use some CSS Variables in Web Inspector
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsEditingSupportjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/EditingSupport.js (191415 => 191416)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/EditingSupport.js 2015-10-22 00:07:27 UTC (rev 191415)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/EditingSupport.js 2015-10-22 00:13:29 UTC (rev 191416)
</span><span class="lines">@@ -218,8 +218,8 @@
</span><span class="cx"> if (event.keyIdentifier !== "U+0009")
</span><span class="cx"> blurEventListener();
</span><span class="cx"> } else if (result && result.startsWith("modify-")) {
</span><del>- var direction = result.substring(7);
- var modifyValue = direction.startsWith("up") ? 1 : -1;
</del><ins>+ let direction = result.substring(7);
+ let modifyValue = direction.startsWith("up") ? 1 : -1;
</ins><span class="cx"> if (direction.endsWith("big"))
</span><span class="cx"> modifyValue *= 10;
</span><span class="cx">
</span><span class="lines">@@ -228,21 +228,21 @@
</span><span class="cx"> else if (event.ctrlKey)
</span><span class="cx"> modifyValue /= 10;
</span><span class="cx">
</span><del>- var selection = element.ownerDocument.defaultView.getSelection();
</del><ins>+ let selection = element.ownerDocument.defaultView.getSelection();
</ins><span class="cx"> if (!selection.rangeCount)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- var range = selection.getRangeAt(0);
</del><ins>+ let range = selection.getRangeAt(0);
</ins><span class="cx"> if (!range.commonAncestorContainer.isSelfOrDescendant(element))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- var wordRange = range.startContainer.rangeOfWord(range.startOffset, WebInspector.EditingSupport.StyleValueDelimiters, element);
- var word = wordRange.toString();
- var wordPrefix = "";
- var wordSuffix = "";
- var nonNumberInWord = /[^\d-\.]+/.exec(word);
</del><ins>+ let wordRange = range.startContainer.rangeOfWord(range.startOffset, WebInspector.EditingSupport.StyleValueDelimiters, element);
+ let word = wordRange.toString();
+ let wordPrefix = "";
+ let wordSuffix = "";
+ let nonNumberInWord = /[^\d-\.]+/.exec(word);
</ins><span class="cx"> if (nonNumberInWord) {
</span><del>- var nonNumberEndOffset = nonNumberInWord.index + nonNumberInWord[0].length;
</del><ins>+ let nonNumberEndOffset = nonNumberInWord.index + nonNumberInWord[0].length;
</ins><span class="cx"> if (range.startOffset > wordRange.startOffset + nonNumberInWord.index && nonNumberEndOffset < word.length && range.startOffset !== wordRange.startOffset) {
</span><span class="cx"> wordPrefix = word.substring(0, nonNumberEndOffset);
</span><span class="cx"> word = word.substring(nonNumberEndOffset);
</span><span class="lines">@@ -252,20 +252,37 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- var matches = WebInspector.EditingSupport.CSSNumberRegex.exec(word);
</del><ins>+ let matches = WebInspector.EditingSupport.CSSNumberRegex.exec(word);
</ins><span class="cx"> if (!matches || matches.length !== 4)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- var replacement = matches[1] + (Math.round((parseFloat(matches[2]) + modifyValue) * 100) / 100) + matches[3];
</del><ins>+ let replacement = matches[1] + (Math.round((parseFloat(matches[2]) + modifyValue) * 100) / 100) + matches[3];
</ins><span class="cx">
</span><span class="cx"> selection.removeAllRanges();
</span><span class="cx"> selection.addRange(wordRange);
</span><span class="cx"> document.execCommand("insertText", false, wordPrefix + replacement + wordSuffix);
</span><span class="cx">
</span><del>- var replacementSelectionRange = document.createRange();
- replacementSelectionRange.setStart(wordRange.commonAncestorContainer, wordRange.startOffset + wordPrefix.length);
- replacementSelectionRange.setEnd(wordRange.commonAncestorContainer, wordRange.startOffset + wordPrefix.length + replacement.length);
</del><ins>+ let container = range.commonAncestorContainer;
+ let startOffset = range.startOffset;
+ // This check is for the situation when the cursor is in the space between the
+ // opening quote of the attribute and the first character. In that spot, the
+ // commonAncestorContainer is actually the entire attribute node since `="` is
+ // added as a simple text node. Since the opening quote is immediately before
+ // the attribute, the node for that attribute must be the next sibling and the
+ // text of the attribute's value must be the first child of that sibling.
+ if (container.parentNode.classList.contains("editing")) {
+ container = container.nextSibling.firstChild;
+ startOffset = 0;
+ }
+ startOffset += wordPrefix.length;
</ins><span class="cx">
</span><ins>+ if (!container)
+ return;
+
+ let replacementSelectionRange = document.createRange();
+ replacementSelectionRange.setStart(container, startOffset);
+ replacementSelectionRange.setEnd(container, startOffset + replacement.length);
+
</ins><span class="cx"> selection.removeAllRanges();
</span><span class="cx"> selection.addRange(replacementSelectionRange);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>