Title: [197337] releases/WebKitGTK/webkit-2.12/Source/WebInspectorUI
- Revision
- 197337
- Author
- carlo...@webkit.org
- Date
- 2016-02-29 03:16:44 -0800 (Mon, 29 Feb 2016)
Log Message
Merge r197245 - Web Inspector: Increase clickable area of the console prompt
https://bugs.webkit.org/show_bug.cgi?id=154719
<rdar://problem/24854538>
Reviewed by Timothy Hatcher.
Clicking on the area around CodeMirror element now moves
focus to the console prompt.
* UserInterface/Views/QuickConsole.js:
(WebInspector.QuickConsole.prototype._handleMouseDown):
Only capture mousedown events on .quick-console.
Don't capture clicks on CodeMirror.
* UserInterface/Views/QuickConsole.css:
(.quick-console > .console-prompt):
(.quick-console > .console-prompt > .CodeMirror):
Make sure .console-prompt is never an event.target for _handleMouseDown.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.12/Source/WebInspectorUI/ChangeLog (197336 => 197337)
--- releases/WebKitGTK/webkit-2.12/Source/WebInspectorUI/ChangeLog 2016-02-29 11:16:05 UTC (rev 197336)
+++ releases/WebKitGTK/webkit-2.12/Source/WebInspectorUI/ChangeLog 2016-02-29 11:16:44 UTC (rev 197337)
@@ -1,5 +1,26 @@
2016-02-26 Nikita Vasilyev <nvasil...@apple.com>
+ Web Inspector: Increase clickable area of the console prompt
+ https://bugs.webkit.org/show_bug.cgi?id=154719
+ <rdar://problem/24854538>
+
+ Reviewed by Timothy Hatcher.
+
+ Clicking on the area around CodeMirror element now moves
+ focus to the console prompt.
+
+ * UserInterface/Views/QuickConsole.js:
+ (WebInspector.QuickConsole.prototype._handleMouseDown):
+ Only capture mousedown events on .quick-console.
+ Don't capture clicks on CodeMirror.
+
+ * UserInterface/Views/QuickConsole.css:
+ (.quick-console > .console-prompt):
+ (.quick-console > .console-prompt > .CodeMirror):
+ Make sure .console-prompt is never an event.target for _handleMouseDown.
+
+2016-02-26 Nikita Vasilyev <nvasil...@apple.com>
+
REGRESSION (r196741): Web Inspector: Bottom section of Layers sidebar is 1px shorter than the console prompt
https://bugs.webkit.org/show_bug.cgi?id=154773
<rdar://problem/24873345>
Modified: releases/WebKitGTK/webkit-2.12/Source/WebInspectorUI/UserInterface/Views/QuickConsole.css (197336 => 197337)
--- releases/WebKitGTK/webkit-2.12/Source/WebInspectorUI/UserInterface/Views/QuickConsole.css 2016-02-29 11:16:05 UTC (rev 197336)
+++ releases/WebKitGTK/webkit-2.12/Source/WebInspectorUI/UserInterface/Views/QuickConsole.css 2016-02-29 11:16:44 UTC (rev 197337)
@@ -54,6 +54,7 @@
overflow-y: auto;
overflow-x: hidden;
+ pointer-events: none;
}
.quick-console > .console-prompt::before {
@@ -72,7 +73,8 @@
}
.quick-console > .console-prompt > .CodeMirror {
- margin: 4px 0 1px;
+ pointer-events: all;
+ margin: 4px 0 2px;
}
.quick-console > .navigation-bar {
Modified: releases/WebKitGTK/webkit-2.12/Source/WebInspectorUI/UserInterface/Views/QuickConsole.js (197336 => 197337)
--- releases/WebKitGTK/webkit-2.12/Source/WebInspectorUI/UserInterface/Views/QuickConsole.js 2016-02-29 11:16:05 UTC (rev 197336)
+++ releases/WebKitGTK/webkit-2.12/Source/WebInspectorUI/UserInterface/Views/QuickConsole.js 2016-02-29 11:16:44 UTC (rev 197337)
@@ -39,6 +39,7 @@
this._frameIdentifierToExecutionContextPathComponentMap = {};
this.element.classList.add("quick-console");
+ this.element.addEventListener("mousedown", this._handleMouseDown.bind(this));
this.prompt = new WebInspector.ConsolePrompt(null, "text/_javascript_");
this.prompt.element.classList.add("text-prompt");
@@ -104,6 +105,15 @@
// Private
+ _handleMouseDown(event)
+ {
+ if (event.target !== this.element)
+ return;
+
+ event.preventDefault();
+ this.prompt.focus();
+ }
+
_executionContextPathComponentsToDisplay()
{
// If we are in the debugger the console will use the active call frame, don't show the selector.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes