<!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>[186212] 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/186212">186212</a></dd>
<dt>Author</dt> <dd>drousso@apple.com</dd>
<dt>Date</dt> <dd>2015-07-01 17:47:52 -0700 (Wed, 01 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make the first click on a rule section create a newline for easy property addition
https://bugs.webkit.org/show_bug.cgi?id=146490
Reviewed by Timothy Hatcher.
* UserInterface/Views/CSSStyleDeclarationTextEditor.js:
(WebInspector.CSSStyleDeclarationTextEditor):
(WebInspector.CSSStyleDeclarationTextEditor.prototype._highlightNextNameOrValue):
(WebInspector.CSSStyleDeclarationTextEditor.prototype._handleEnterKey): Inserts a semicolon if the line is missing one.
(WebInspector.CSSStyleDeclarationTextEditor.prototype._handleMouseDown): If the user clicks on a property with the editor being
unfocused, the name/value containing the cursor will be highlighted. If instead the user clicks at the end of a line, the
cursor's position is saved for mouseUp.
(WebInspector.CSSStyleDeclarationTextEditor.prototype._handleMouseUp): If the mouseDown cursor position was saved and is equal
to the current cursor's position (the user did not drag), add a newline after the current line and place the cursor on that line.
(WebInspector.CSSStyleDeclarationTextEditor.prototype._handleTabKey):
(WebInspector.CSSStyleDeclarationTextEditor.prototype._handleTabKey.highlightNextNameOrValue): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsCSSStyleDeclarationTextEditorjs">trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationTextEditor.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (186211 => 186212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-07-02 00:40:04 UTC (rev 186211)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-07-02 00:47:52 UTC (rev 186212)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-07-01 Devin Rousso <drousso@apple.com>
+
+ Make the first click on a rule section create a newline for easy property addition
+ https://bugs.webkit.org/show_bug.cgi?id=146490
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Views/CSSStyleDeclarationTextEditor.js:
+ (WebInspector.CSSStyleDeclarationTextEditor):
+ (WebInspector.CSSStyleDeclarationTextEditor.prototype._highlightNextNameOrValue):
+ (WebInspector.CSSStyleDeclarationTextEditor.prototype._handleEnterKey): Inserts a semicolon if the line is missing one.
+ (WebInspector.CSSStyleDeclarationTextEditor.prototype._handleMouseDown): If the user clicks on a property with the editor being
+ unfocused, the name/value containing the cursor will be highlighted. If instead the user clicks at the end of a line, the
+ cursor's position is saved for mouseUp.
+ (WebInspector.CSSStyleDeclarationTextEditor.prototype._handleMouseUp): If the mouseDown cursor position was saved and is equal
+ to the current cursor's position (the user did not drag), add a newline after the current line and place the cursor on that line.
+ (WebInspector.CSSStyleDeclarationTextEditor.prototype._handleTabKey):
+ (WebInspector.CSSStyleDeclarationTextEditor.prototype._handleTabKey.highlightNextNameOrValue): Deleted.
+
</ins><span class="cx"> 2015-06-30 Devin Rousso <drousso@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: add " = $0" hint after selected element in main DOMTreeOutline
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsCSSStyleDeclarationTextEditorjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationTextEditor.js (186211 => 186212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationTextEditor.js 2015-07-02 00:40:04 UTC (rev 186211)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationTextEditor.js 2015-07-02 00:47:52 UTC (rev 186212)
</span><span class="lines">@@ -33,7 +33,11 @@
</span><span class="cx"> this._element = element || document.createElement("div");
</span><span class="cx"> this._element.classList.add(WebInspector.CSSStyleDeclarationTextEditor.StyleClassName);
</span><span class="cx"> this._element.classList.add(WebInspector.SyntaxHighlightedStyleClassName);
</span><ins>+ this._element.addEventListener("mousedown", this._handleMouseDown.bind(this));
+ this._element.addEventListener("mouseup", this._handleMouseUp.bind(this));
</ins><span class="cx">
</span><ins>+ this._mouseDownCursorPosition = null;
+
</ins><span class="cx"> this._showsImplicitProperties = true;
</span><span class="cx"> this._alwaysShowPropertyNames = {};
</span><span class="cx"> this._filterResultPropertyNames = null;
</span><span class="lines">@@ -58,6 +62,7 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> this._codeMirror.addKeyMap({
</span><ins>+ "Enter": this._handleEnterKey.bind(this),
</ins><span class="cx"> "Shift-Enter": this._insertNewlineAfterCurrentLine.bind(this),
</span><span class="cx"> "Shift-Tab": this._handleShiftTabKey.bind(this),
</span><span class="cx"> "Tab": this._handleTabKey.bind(this)
</span><span class="lines">@@ -389,6 +394,68 @@
</span><span class="cx">
</span><span class="cx"> // Private
</span><span class="cx">
</span><ins>+ _highlightNextNameOrValue(codeMirror, cursor, text)
+ {
+ var match = text.match(/(?:[^:;\s]\s*)+/g);
+ var firstMatch = text.indexOf(match[0]) + match[0].length;
+ var nextHead = cursor.ch < firstMatch ? text.indexOf(match[0]) : text.indexOf(match[1]);
+ var nextAnchor = cursor.ch < firstMatch ? firstMatch : text.indexOf(match[1]) + match[1].length;
+
+ codeMirror.setSelection({line: cursor.line, ch: nextHead}, {line: cursor.line, ch: nextAnchor});
+ }
+
+ _handleMouseDown(event)
+ {
+ if (this._codeMirror.options.readOnly || this._codeMirror.state.focused)
+ return;
+
+ var cursor = this._codeMirror.coordsChar({left: event.x, top: event.y});
+ var line = this._codeMirror.getLine(cursor.line);
+ var trimmedLine = line.trimRight();
+
+ if (!trimmedLine.trimLeft().length)
+ return;
+
+ if (cursor.ch !== trimmedLine.length) {
+ this._highlightNextNameOrValue(this._codeMirror, cursor, line);
+ return;
+ }
+
+ this._mouseDownCursorPosition = cursor;
+ }
+
+ _handleMouseUp(event)
+ {
+ if (this._codeMirror.options.readOnly || !this._mouseDownCursorPosition)
+ return;
+
+ var cursor = this._codeMirror.coordsChar({left: event.x, top: event.y});
+ var line = this._codeMirror.getLine(cursor.line);
+
+ if (this._mouseDownCursorPosition.line === cursor.line && this._mouseDownCursorPosition.ch === cursor.ch)
+ this._codeMirror.replaceRange(line.trimRight().endsWith(";") ? "\n" : ";\n", cursor);
+
+ this._mouseDownCursorPosition = null;
+ }
+
+ _handleEnterKey(codeMirror)
+ {
+ var cursor = codeMirror.getCursor();
+ var line = codeMirror.getLine(cursor.line);
+ var trimmedLine = line.trimRight();
+ var hasEndingSemicolon = trimmedLine.endsWith(";");
+
+ if (hasEndingSemicolon && cursor.ch === trimmedLine.length - 1)
+ ++cursor.ch;
+
+ if (cursor.ch === trimmedLine.length) {
+ codeMirror.replaceRange(hasEndingSemicolon ? "\n" : ";\n", cursor);
+ return;
+ }
+
+ return CodeMirror.Pass;
+ }
+
</ins><span class="cx"> _insertNewlineAfterCurrentLine(codeMirror)
</span><span class="cx"> {
</span><span class="cx"> var cursor = codeMirror.getCursor();
</span><span class="lines">@@ -459,16 +526,6 @@
</span><span class="cx"> return CodeMirror.Pass;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function highlightNextNameOrValue(text)
- {
- var match = text.match(/(?:[^:;\s]\s*)+/g);
- var firstMatch = text.indexOf(match[0]) + match[0].length;
- var nextHead = cursor.ch < firstMatch ? text.indexOf(match[0]) : text.indexOf(match[1]);
- var nextAnchor = cursor.ch < firstMatch ? firstMatch : text.indexOf(match[1]) + match[1].length;
-
- codeMirror.setSelection({line: cursor.line, ch: nextHead}, {line: cursor.line, ch: nextAnchor});
- }
-
</del><span class="cx"> var cursor = codeMirror.getCursor();
</span><span class="cx"> var line = codeMirror.getLine(cursor.line);
</span><span class="cx"> var trimmedLine = line.trimRight();
</span><span class="lines">@@ -486,7 +543,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ++cursor.line;
</span><del>- highlightNextNameOrValue(nextLine);
</del><ins>+ this._highlightNextNameOrValue(codeMirror, cursor, nextLine);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -526,7 +583,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- highlightNextNameOrValue(line);
</del><ins>+ this._highlightNextNameOrValue(codeMirror, cursor, line);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> _clearRemoveEditingLineClassesTimeout()
</span></span></pre>
</div>
</div>
</body>
</html>