Title: [254061] trunk/Source/WebInspectorUI
- Revision
- 254061
- Author
- nvasil...@apple.com
- Date
- 2020-01-06 10:24:27 -0800 (Mon, 06 Jan 2020)
Log Message
REGRESSION(r218839): Web Inspector: Color picker: pressing Esc should hide color picker
https://bugs.webkit.org/show_bug.cgi?id=205570
<rdar://problem/58169820>
Reviewed by Brian Burg.
* UserInterface/Views/QuickConsole.js:
(WI.QuickConsole.prototype.set keyboardShortcutDisabled):
(WI.QuickConsole.prototype._toggleOrFocus):
Restore keyboardShortcutDisabled setter, which was removed in r218839 without any explanation.
Modified Paths
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (254060 => 254061)
--- trunk/Source/WebInspectorUI/ChangeLog 2020-01-06 18:08:17 UTC (rev 254060)
+++ trunk/Source/WebInspectorUI/ChangeLog 2020-01-06 18:24:27 UTC (rev 254061)
@@ -1,3 +1,16 @@
+2020-01-06 Nikita Vasilyev <nvasil...@apple.com>
+
+ REGRESSION(r218839): Web Inspector: Color picker: pressing Esc should hide color picker
+ https://bugs.webkit.org/show_bug.cgi?id=205570
+ <rdar://problem/58169820>
+
+ Reviewed by Brian Burg.
+
+ * UserInterface/Views/QuickConsole.js:
+ (WI.QuickConsole.prototype.set keyboardShortcutDisabled):
+ (WI.QuickConsole.prototype._toggleOrFocus):
+ Restore keyboardShortcutDisabled setter, which was removed in r218839 without any explanation.
+
2020-01-06 Devin Rousso <drou...@apple.com>
Web Inspector: Canvas: unable to see recording actions for WebGL canvases that have lots of shader programs
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/QuickConsole.js (254060 => 254061)
--- trunk/Source/WebInspectorUI/UserInterface/Views/QuickConsole.js 2020-01-06 18:08:17 UTC (rev 254060)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/QuickConsole.js 2020-01-06 18:24:27 UTC (rev 254061)
@@ -31,6 +31,7 @@
this._toggleOrFocusKeyboardShortcut = new WI.KeyboardShortcut(null, WI.KeyboardShortcut.Key.Escape, this._toggleOrFocus.bind(this));
this._toggleOrFocusKeyboardShortcut.implicitlyPreventsDefault = false;
+ this._keyboardShortcutDisabled = false;
this._automaticExecutionContextPathComponent = this._createExecutionContextPathComponent(null, WI.UIString("Auto"));
this._updateAutomaticExecutionContextPathComponentTooltip();
@@ -101,6 +102,11 @@
return this._navigationBar;
}
+ set keyboardShortcutDisabled(disabled)
+ {
+ this._keyboardShortcutDisabled = disabled;
+ }
+
closed()
{
WI.settings.consoleSavedResultAlias.removeEventListener(null, null, this);
@@ -446,6 +452,9 @@
_toggleOrFocus(event)
{
+ if (this._keyboardShortcutDisabled)
+ return;
+
if (this.prompt.focused) {
WI.toggleSplitConsole();
event.preventDefault();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
