<!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>[193072] 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/193072">193072</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2015-12-03 10:43:17 -0800 (Thu, 03 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/188138">r188138</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="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsBoxModelDetailsSectionRowjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/BoxModelDetailsSectionRow.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsDOMTreeElementjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsEditingSupportjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/EditingSupport.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 (193071 => 193072)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:43:11 UTC (rev 193071)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:43:17 UTC (rev 193072)
</span><span class="lines">@@ -1,5 +1,31 @@
</span><span class="cx"> 2015-12-02 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Merge r188138. rdar://problem/23221163
+
+ 2015-08-07 Devin Rousso <drousso@apple.com>
+
+ Web Inspector: Option+Up/Down arrow keys should increment/decrement numbers in HTML and SVG attributes
+ https://bugs.webkit.org/show_bug.cgi?id=147317
+
+ Reviewed by Timothy Hatcher.
+
+ If the value under the cursor in an HTML element attribute is a number, pressing alt and
+ up/down will increment/decrement the number value and apply that change to the element.
+
+ * UserInterface/Views/BoxModelDetailsSectionRow.js:
+ (WebInspector.BoxModelDetailsSectionRow.prototype._alteredFloatNumber):
+ (WebInspector.BoxModelDetailsSectionRow.prototype._handleKeyDown):
+ * UserInterface/Views/DOMTreeElement.js:
+ (WebInspector.DOMTreeElement.prototype._startEditingAttribute):
+ (WebInspector.DOMTreeElement.prototype._attributeEditingCommitted):
+ (WebInspector.DOMTreeElement.prototype._attributeNumberEditingCommitted):
+ * UserInterface/Views/EditingSupport.js:
+ (WebInspector.EditingConfig.prototype.setNumberCommitHandler):
+ (WebInspector.startEditing.defaultFinishHandler):
+ (WebInspector.startEditing.handleEditingResult):
+
+2015-12-02 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Merge r188029. rdar://problem/23221163
</span><span class="cx">
</span><span class="cx"> 2015-08-05 Devin Rousso <drousso@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsBoxModelDetailsSectionRowjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/BoxModelDetailsSectionRow.js (193071 => 193072)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/BoxModelDetailsSectionRow.js 2015-12-03 18:43:11 UTC (rev 193071)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/BoxModelDetailsSectionRow.js 2015-12-03 18:43:17 UTC (rev 193072)
</span><span class="lines">@@ -295,7 +295,7 @@
</span><span class="cx"> // Make the new number and constrain it to a precision of 6, this matches numbers the engine returns.
</span><span class="cx"> // Use the Number constructor to forget the fixed precision, so 1.100000 will print as 1.1.
</span><span class="cx"> var result = Number((number + changeAmount).toFixed(6));
</span><del>- if (!String(result).match(WebInspector.BoxModelDetailsSectionRow.CSSNumberRegex))
</del><ins>+ if (!String(result).match(WebInspector.EditingSupport.NumberRegex))
</ins><span class="cx"> return null;
</span><span class="cx">
</span><span class="cx"> return result;
</span><span class="lines">@@ -317,10 +317,10 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> var originalValue = element.textContent;
</span><del>- var wordRange = selectionRange.startContainer.rangeOfWord(selectionRange.startOffset, WebInspector.BoxModelDetailsSectionRow.StyleValueDelimiters, element);
</del><ins>+ var wordRange = selectionRange.startContainer.rangeOfWord(selectionRange.startOffset, WebInspector.EditingSupport.StyleValueDelimiters, element);
</ins><span class="cx"> var wordString = wordRange.toString();
</span><span class="cx">
</span><del>- var matches = /(.*?)(-?(?:\d+(?:\.\d+)?|\.\d+))(.*)/.exec(wordString);
</del><ins>+ var matches = WebInspector.EditingSupport.NumberRegex.exec(wordString);
</ins><span class="cx"> var replacementString;
</span><span class="cx"> if (matches && matches.length) {
</span><span class="cx"> var prefix = matches[1];
</span><span class="lines">@@ -442,6 +442,3 @@
</span><span class="cx"> this._applyUserInput(element, userInput, previousContent, context, true);
</span><span class="cx"> }
</span><span class="cx"> };
</span><del>-
-WebInspector.BoxModelDetailsSectionRow.StyleValueDelimiters = " \xA0\t\n\"':;,/()";
-WebInspector.BoxModelDetailsSectionRow.CSSNumberRegex = /^(-?(?:\d+(?:\.\d+)?|\.\d+))$/;
</del></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsDOMTreeElementjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js (193071 => 193072)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js 2015-12-03 18:43:11 UTC (rev 193071)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js 2015-12-03 18:43:17 UTC (rev 193072)
</span><span class="lines">@@ -756,6 +756,7 @@
</span><span class="cx"> removeZeroWidthSpaceRecursive(attribute);
</span><span class="cx">
</span><span class="cx"> var config = new WebInspector.EditingConfig(this._attributeEditingCommitted.bind(this), this._editingCancelled.bind(this), attributeName);
</span><ins>+ config.setNumberCommitHandler(this._attributeNumberEditingCommitted.bind(this));
</ins><span class="cx"> this._editing = WebInspector.startEditing(attribute, config);
</span><span class="cx">
</span><span class="cx"> window.getSelection().setBaseAndExtent(elementForSelection, 0, elementForSelection, 1);
</span><span class="lines">@@ -876,6 +877,9 @@
</span><span class="cx">
</span><span class="cx"> _attributeEditingCommitted(element, newText, oldText, attributeName, moveDirection)
</span><span class="cx"> {
</span><ins>+ if (newText === oldText)
+ return;
+
</ins><span class="cx"> this._editing = false;
</span><span class="cx">
</span><span class="cx"> var treeOutline = this.treeOutline;
</span><span class="lines">@@ -931,6 +935,14 @@
</span><span class="cx"> this.representedObject.setAttribute(attributeName, newText, moveToNextAttributeIfNeeded.bind(this));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ _attributeNumberEditingCommitted(element, newText, oldText, attributeName, moveDirection)
+ {
+ if (newText === oldText)
+ return;
+
+ this.representedObject.setAttribute(attributeName, newText);
+ }
+
</ins><span class="cx"> _tagNameEditingCommitted(element, newText, oldText, tagName, moveDirection)
</span><span class="cx"> {
</span><span class="cx"> this._editing = false;
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsEditingSupportjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/EditingSupport.js (193071 => 193072)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/EditingSupport.js 2015-12-03 18:43:11 UTC (rev 193071)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/EditingSupport.js 2015-12-03 18:43:17 UTC (rev 193072)
</span><span class="lines">@@ -98,6 +98,11 @@
</span><span class="cx"> {
</span><span class="cx"> this.customFinishHandler = customFinishHandler;
</span><span class="cx"> }
</span><ins>+
+ setNumberCommitHandler(numberCommitHandler)
+ {
+ this.numberCommitHandler = numberCommitHandler;
+ }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WebInspector.startEditing = function(element, config)
</span><span class="lines">@@ -190,6 +195,12 @@
</span><span class="cx"> return "cancel";
</span><span class="cx"> else if (event.keyIdentifier === "U+0009") // Tab key
</span><span class="cx"> return "move-" + (event.shiftKey ? "backward" : "forward");
</span><ins>+ else if (event.altKey) {
+ if (event.keyIdentifier === "Up" || event.keyIdentifier === "Down")
+ return "modify-" + (event.keyIdentifier === "Up" ? "up" : "down");
+ if (event.keyIdentifier === "PageUp" || event.keyIdentifier === "PageDown")
+ return "modify-" + (event.keyIdentifier === "PageUp" ? "up-big" : "down-big");
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function handleEditingResult(result, event)
</span><span class="lines">@@ -206,6 +217,62 @@
</span><span class="cx"> moveDirection = result.substring(5);
</span><span class="cx"> if (event.keyIdentifier !== "U+0009")
</span><span class="cx"> blurEventListener();
</span><ins>+ } else if (result && result.startsWith("modify-")) {
+ var direction = result.substring(7);
+ var modifyValue = direction.startsWith("up") ? 1 : -1;
+ if (direction.endsWith("big"))
+ modifyValue *= 10;
+
+ if (event.shiftKey)
+ modifyValue *= 10;
+ else if (event.ctrlKey)
+ modifyValue /= 10;
+
+ var selection = element.ownerDocument.defaultView.getSelection();
+ if (!selection.rangeCount)
+ return;
+
+ var range = selection.getRangeAt(0);
+ if (!range.commonAncestorContainer.isSelfOrDescendant(element))
+ return false;
+
+ var wordRange = range.startContainer.rangeOfWord(range.startOffset, WebInspector.EditingSupport.StyleValueDelimiters, element);
+ var word = wordRange.toString();
+ var wordPrefix = "";
+ var wordSuffix = "";
+ var nonNumberInWord = /[^\d-\.]+/.exec(word);
+ if (nonNumberInWord) {
+ var nonNumberEndOffset = nonNumberInWord.index + nonNumberInWord[0].length;
+ if (range.startOffset > wordRange.startOffset + nonNumberInWord.index && nonNumberEndOffset < word.length && range.startOffset !== wordRange.startOffset) {
+ wordPrefix = word.substring(0, nonNumberEndOffset);
+ word = word.substring(nonNumberEndOffset);
+ } else {
+ wordSuffix = word.substring(nonNumberInWord.index);
+ word = word.substring(0, nonNumberInWord.index);
+ }
+ }
+
+ var matches = WebInspector.EditingSupport.CSSNumberRegex.exec(word);
+ if (!matches || matches.length !== 4)
+ return;
+
+ var replacement = matches[1] + (Math.round((parseFloat(matches[2]) + modifyValue) * 100) / 100) + matches[3];
+
+ selection.removeAllRanges();
+ selection.addRange(wordRange);
+ document.execCommand("insertText", false, wordPrefix + replacement + wordSuffix);
+
+ var replacementSelectionRange = document.createRange();
+ replacementSelectionRange.setStart(wordRange.commonAncestorContainer, wordRange.startOffset + wordPrefix.length);
+ replacementSelectionRange.setEnd(wordRange.commonAncestorContainer, wordRange.startOffset + wordPrefix.length + replacement.length);
+
+ selection.removeAllRanges();
+ selection.addRange(replacementSelectionRange);
+
+ if (typeof config.numberCommitHandler === "function")
+ config.numberCommitHandler(element, getContent(element), oldText, context, moveDirection);
+
+ event.preventDefault();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -234,3 +301,9 @@
</span><span class="cx"> commit: editingCommitted.bind(element)
</span><span class="cx"> };
</span><span class="cx"> };
</span><ins>+
+WebInspector.EditingSupport = {
+ StyleValueDelimiters: " \xA0\t\n\"':;,/()",
+ CSSNumberRegex: /(.*?)(-?(?:\d+(?:\.\d+)?|\.\d+))(.*)/,
+ NumberRegex: /^(-?(?:\d+(?:\.\d+)?|\.\d+))$/
+};
</ins></span></pre>
</div>
</div>
</body>
</html>